1 files changed, 4 insertions, 1 deletions
diff --git a/chips/src/com/android/ex/chips/BaseRecipientAdapter.java b/chips/src/com/android/ex/chips/BaseRecipientAdapter.java
index d52c7ca..531fd37 100644
--- a/chips/src/com/android/ex/chips/BaseRecipientAdapter.java
+++ b/chips/src/com/android/ex/chips/BaseRecipientAdapter.java
@@ -952,8 +952,11 @@ public abstract class BaseRecipientAdapter extends BaseAdapter implements Filter
     public View getView(int position, View convertView, ViewGroup parent) {
         final RecipientEntry entry = getEntries().get(position);
 
+        final String constraint = mCurrentConstraint == null ? null :
+                mCurrentConstraint.toString();
+
         return mDropdownChipLayouter.bindView(convertView, parent, entry, position,
-                AdapterType.BASE_RECIPIENT, mCurrentConstraint.toString());
+                AdapterType.BASE_RECIPIENT, constraint);
     }
 
     public Account getAccount() {