diff --git a/plugins/lint/lint-api/src/com/android/tools/klint/client/api/LintDriver.java b/plugins/lint/lint-api/src/com/android/tools/klint/client/api/LintDriver.java
index 00cb8640f29..b50ff825875 100644
--- a/plugins/lint/lint-api/src/com/android/tools/klint/client/api/LintDriver.java
+++ b/plugins/lint/lint-api/src/com/android/tools/klint/client/api/LintDriver.java
@@ -1490,7 +1490,7 @@ public class LintDriver {
             @NotNull List<UastScanner> detectors,
             @NotNull List<File> files) {
         com.intellij.openapi.project.Project intellijProject = mClient.getProject();
-        if (intellijProject == null) {
+        if (intellijProject == null || intellijProject.isDisposed()) {
             return;
         }