diff --git a/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkImpl.java b/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkImpl.java
index 6a28373ca541..5455a946192a 100644
--- a/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkImpl.java
+++ b/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkImpl.java
@@ -70,7 +70,8 @@ public class AndroidSdkImpl extends AndroidSdk {
 
   @Override
   public IAndroidTarget findTargetByHashString(@NotNull String hashString) {
-    return new MyTargetWrapper(mySdkManager.getTargetFromHashString(hashString));
+    final IAndroidTarget target = mySdkManager.getTargetFromHashString(hashString);
+    return target != null ? new MyTargetWrapper(target) : null;
   }
 
   @NotNull