diff --git a/python/educational-core/src/com/jetbrains/edu/coursecreator/CCProjectComponent.java b/python/educational-core/src/com/jetbrains/edu/coursecreator/CCProjectComponent.java
index a9f5fc3a68f5..4e0e4e7bb726 100644
--- a/python/educational-core/src/com/jetbrains/edu/coursecreator/CCProjectComponent.java
+++ b/python/educational-core/src/com/jetbrains/edu/coursecreator/CCProjectComponent.java
@@ -119,6 +119,8 @@ public class CCProjectComponent extends AbstractProjectComponent {
   }
 
   public void projectClosed() {
-    VirtualFileManager.getInstance().removeVirtualFileListener(myTaskFileLifeListener);
+    if (myTaskFileLifeListener != null) {
+      VirtualFileManager.getInstance().removeVirtualFileListener(myTaskFileLifeListener);
+    }
   }
 }