diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectComponent.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectComponent.java
index 20e7753e0247..8b524dbffd4b 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectComponent.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectComponent.java
@@ -96,7 +96,9 @@ public class CCProjectComponent implements ProjectComponent {
   }
 
   public void projectClosed() {
-    VirtualFileManager.getInstance().removeVirtualFileListener(myListener);
+    if (myListener != null) {
+      VirtualFileManager.getInstance().removeVirtualFileListener(myListener);
+    }
   }
 
   private class FileDeletedListener extends VirtualFileAdapter {