diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java
index 6424612dbb3..65275a2e979 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java
@@ -144,7 +144,7 @@ public class CodeInsightUtils {
 
         PsiElement stopElement = element2.getNextSibling();
         List<PsiElement> array = new ArrayList<PsiElement>();
-        for (PsiElement currentElement = element1; currentElement != stopElement; currentElement = currentElement.getNextSibling()) {
+        for (PsiElement currentElement = element1; currentElement != stopElement && currentElement != null; currentElement = currentElement.getNextSibling()) {
             if (aClass.isInstance(currentElement)) {
                 array.add(currentElement);
             }