diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/DeclarationJoinLinesHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/DeclarationJoinLinesHandler.java index f6273219ed17..d5ce42f12b1a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/DeclarationJoinLinesHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/DeclarationJoinLinesHandler.java @@ -62,7 +62,10 @@ public class DeclarationJoinLinesHandler implements JoinLinesHandlerDelegate { PsiAssignmentExpression assignment = (PsiAssignmentExpression)ref.getParent(); if (!(assignment.getParent() instanceof PsiExpressionStatement)) return -1; - if (ReferencesSearch.search(var, new LocalSearchScope(assignment.getRExpression()), false).findFirst() != null) { + PsiExpression rExpression = assignment.getRExpression(); + if (rExpression == null) return -1; + + if (ReferencesSearch.search(var, new LocalSearchScope(rExpression), false).findFirst() != null) { return -1; }