diff --git a/python/educational-core/src/com/jetbrains/edu/learning/StudyProjectComponent.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyProjectComponent.java
index c87e0deafd7b..25df4580bbc9 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/StudyProjectComponent.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/StudyProjectComponent.java
@@ -329,7 +329,9 @@ public class StudyProjectComponent implements ProjectComponent {
 
   @Override
   public void disposeComponent() {
-    myBusConnection.disconnect();
+    if (myBusConnection != null) {
+      myBusConnection.disconnect();
+    }
   }
 
   @NotNull