NPE

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/DocumentFoldingInfo.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/DocumentFoldingInfo.java
index 406821455418e238c8c4c9ebfd6eadd6d8faf5fb..ca7ee42c685bade094ae050a96f5442e586ae110 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/DocumentFoldingInfo.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/DocumentFoldingInfo.java
@@ -128,7 +128,7 @@ public class DocumentFoldingInfo implements JDOMExternalizable, CodeFoldingState
           String placeHolderText = myPlaceholderTexts.get(marker);
           region = ((FoldingModelEx)editor.getFoldingModel()).createFoldRegion(marker.getStartOffset(), marker.getEndOffset(), placeHolderText, null);  
           //may fail to add in case intersecting region exists
-          if (!editor.getFoldingModel().addFoldRegion(region)) return;
+          if (region == null || !editor.getFoldingModel().addFoldRegion(region)) return;
         }
 
         boolean state = myExpandedStates.get(i).booleanValue();