diff --git a/chips/src/com/android/ex/chips/RecipientEntry.java b/chips/src/com/android/ex/chips/RecipientEntry.java
index 14b11e1..f7155b0 100644
--- a/chips/src/com/android/ex/chips/RecipientEntry.java
+++ b/chips/src/com/android/ex/chips/RecipientEntry.java
@@ -110,7 +110,7 @@
      */
     public static RecipientEntry constructFakeEntry(final String address, final boolean isValid) {
         final Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(address);
-        final String tokenizedAddress = tokens[0].getAddress();
+        final String tokenizedAddress = tokens.length > 0 ? tokens[0].getAddress() : address;
 
         return new RecipientEntry(ENTRY_TYPE_PERSON, tokenizedAddress, tokenizedAddress,
                 INVALID_DESTINATION_TYPE, null,