diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 27b248784..7ac5ca49c 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -1890,6 +1890,10 @@ public class EmailProvider extends ContentProvider {
             if (cache != null && c != null && Email.DEBUG) {
                 cache.recordQueryTime(c, System.nanoTime() - time);
             }
+            if (c == null) {
+                // This should never happen, but let's be sure to log it...
+                Log.e(TAG, "Query returning null for uri: " + uri + ", selection: " + selection);
+            }
         }
 
         if ((c != null) && !isTemporary()) {