diff --git a/src/com/android/contacts/model/EntityModifier.java b/src/com/android/contacts/model/EntityModifier.java
index 519ff80..fb3eba7 100644
--- a/src/com/android/contacts/model/EntityModifier.java
+++ b/src/com/android/contacts/model/EntityModifier.java
@@ -409,6 +409,9 @@
      * terms of {@link DataKind#fieldList}.
      */
     public static boolean isEmpty(ValuesDelta values, DataKind kind) {
+        // No defined fields mean this row is always empty
+        if (kind.fieldList == null) return true;
+
         boolean hasValues = false;
         for (EditField field : kind.fieldList) {
             // If any field has values, we're not empty