diff --git a/src/js/select2/data/tokenizer.js b/src/js/select2/data/tokenizer.js
index 456f9b2c..4a0faef6 100644
--- a/src/js/select2/data/tokenizer.js
+++ b/src/js/select2/data/tokenizer.js
@@ -72,6 +72,11 @@ define([
 
       var data = createTag(partParams);
 
+      if (data == null) {
+        i++;
+        continue;
+      }
+
       callback(data);
 
       // Reset the term to not include the tokenized portion