diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java
index ffbcf2da2e61..0ac714e7d8c3 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java
@@ -92,9 +92,11 @@ public class ChangeSignatureGestureDetector extends PsiTreeChangeAdapter impleme
       myDeaf = true;
       final MyDocumentChangeAdapter changeBean = myListenerMap.get(file);
       final ChangeInfo currentInfo = changeBean.getCurrentInfo();
-      final LanguageChangeSignatureDetector detector = LanguageChangeSignatureDetectors.INSTANCE.forLanguage(currentInfo.getLanguage());
-      if (detector.showDialog(currentInfo, changeBean.getInitialText())) {
-        changeBean.reinit();
+      if (currentInfo != null) {
+        final LanguageChangeSignatureDetector detector = LanguageChangeSignatureDetectors.INSTANCE.forLanguage(currentInfo.getLanguage());
+        if (detector.showDialog(currentInfo, changeBean.getInitialText())) {
+          changeBean.reinit();
+        }
       }
     }
     finally {