1 files changed, 6 insertions, 1 deletions
diff --git a/info_lookup/src/com/cyanogen/lookup/phonenumber/provider/LookupProviderImpl.java b/info_lookup/src/com/cyanogen/lookup/phonenumber/provider/LookupProviderImpl.java
index 9681e077..4a01758d 100644
--- a/info_lookup/src/com/cyanogen/lookup/phonenumber/provider/LookupProviderImpl.java
+++ b/info_lookup/src/com/cyanogen/lookup/phonenumber/provider/LookupProviderImpl.java
@@ -168,7 +168,12 @@ public class LookupProviderImpl implements LookupProvider {
         return null;
     }
 
-    private LookupResponse createLookupResponse(LookupByNumberResult lookupByNumberResult) {
+    private synchronized LookupResponse createLookupResponse(
+            LookupByNumberResult lookupByNumberResult) {
+        if (mProviderInfo == null) {
+            // lookup provider has been inactivated
+            return null;
+        }
         LookupResponse lookupResponse = new LookupResponse();
         CallerInfo callerInfo = lookupByNumberResult.getCallerInfo();
         int lookupStatusCode = lookupByNumberResult.getStatus().getStatusCode();