1 files changed, 4 insertions, 1 deletions
diff --git a/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaMethodParameterUnwrapper.java b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaMethodParameterUnwrapper.java
index 1c1957bcf472..91c2238240ba 100644
--- a/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaMethodParameterUnwrapper.java
+++ b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaMethodParameterUnwrapper.java
@@ -31,7 +31,10 @@ public class JavaMethodParameterUnwrapper extends JavaUnwrapper {
 
   private static PsiElement adjustElementToTheLeft(PsiElement element) {
     if (element instanceof PsiJavaToken && ((PsiJavaToken)element).getTokenType() == JavaTokenType.RPARENTH) {
-      return element.getPrevSibling();
+      PsiElement prevSibling = element.getPrevSibling();
+      if (prevSibling != null) {
+        return prevSibling;
+      }
     }
     return element;
   }