1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/nfc/cardemulation/RegisteredAidCache.java b/src/com/android/nfc/cardemulation/RegisteredAidCache.java
index ff426846..e3607743 100644
--- a/src/com/android/nfc/cardemulation/RegisteredAidCache.java
+++ b/src/com/android/nfc/cardemulation/RegisteredAidCache.java
@@ -161,7 +161,10 @@ public class RegisteredAidCache implements RegisteredServicesCache.Callback {
         synchronized (mLock) {
             resolveInfo = mAidCache.get(aid);
         }
-        if (resolveInfo.services == null || resolveInfo.services.size() == 0) return false;
+        if (resolveInfo == null || resolveInfo.services == null ||
+                resolveInfo.services.size() == 0) {
+            return false;
+        }
 
         if (resolveInfo.defaultService != null) {
             return service.equals(resolveInfo.defaultService.getComponent());