diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskCheckinHandlerFactory.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskCheckinHandlerFactory.java
index 77f4cf7f3115..b1499df1e6c1 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskCheckinHandlerFactory.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskCheckinHandlerFactory.java
@@ -59,7 +59,9 @@ public class TaskCheckinHandlerFactory extends CheckinHandlerFactory {
             SwingUtilities.invokeLater(new Runnable() {
               @Override
               public void run() {
-                WorkingContextManager.getInstance(project).saveContext(localTask);
+                if (!project.isDisposed()) {
+                  WorkingContextManager.getInstance(project).saveContext(localTask);
+                }
               }
             });
           }