diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java
index 191b590..0d24d57 100644
--- a/chips/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java
@@ -2508,8 +2508,8 @@
                                     new ArrayList<RecipientChip>(addresses.size());
 
                             for (final RecipientChip temp : recipients) {
-                                if (RecipientEntry.isCreatedRecipient(temp.getEntry()
-                                        .getContactId())
+                                if (temp != null && RecipientEntry.isCreatedRecipient(
+                                        temp.getEntry().getContactId())
                                         && getSpannable().getSpanStart(temp) != -1) {
                                     if (addresses.contains(temp.getEntry().getDestination())) {
                                         replacements.add(createFreeChip(temp.getEntry()));