diff --git a/plugins/git4idea/src/git4idea/commands/GitTask.java b/plugins/git4idea/src/git4idea/commands/GitTask.java
index aeee1251d300..491066a0769e 100644
--- a/plugins/git4idea/src/git4idea/commands/GitTask.java
+++ b/plugins/git4idea/src/git4idea/commands/GitTask.java
@@ -373,7 +373,9 @@ public class GitTask {
     }
 
     public void dispose() {
-      myTimer.cancel();
+      if (myTimer != null) {
+        myTimer.cancel();
+      }
     }
   }