diff --git a/source/com/intellij/codeInsight/editorActions/TypedHandler.java b/source/com/intellij/codeInsight/editorActions/TypedHandler.java index 737641bf6bb3..db0ae536cb5b 100644 --- a/source/com/intellij/codeInsight/editorActions/TypedHandler.java +++ b/source/com/intellij/codeInsight/editorActions/TypedHandler.java @@ -371,7 +371,7 @@ public class TypedHandler implements TypedActionHandler { PsiElement elementAt = file.findElementAt(offset-1); // TODO: handle it with insertAfterRParen(...) - if (!JspxCompletionData.isJavaContext(elementAt)) { + if (elementAt!=null && !JspxCompletionData.isJavaContext(elementAt)) { while(!elementAt.getText().startsWith("${")) { elementAt = elementAt.getPrevSibling(); if (elementAt==null) break;