Index: modules/swing/src/main/java/common/javax/swing/text/JTextComponent.java =================================================================== --- modules/swing/src/main/java/common/javax/swing/text/JTextComponent.java (revision 488923) +++ modules/swing/src/main/java/common/javax/swing/text/JTextComponent.java (working copy) @@ -1042,7 +1042,9 @@ for (int i = 0; i < listeners.length; i++) { listeners[i].caretUpdate(ce); } - handleComposedText(ce.getDot()); + if (ce != null) { + handleComposedText(ce.getDot()); + } } private void handleComposedText(final int dot) {