diff --git a/JSTokenField/JSTokenField.m b/JSTokenField/JSTokenField.m
index 94c6cf4..a8a98f5 100644
--- a/JSTokenField/JSTokenField.m
+++ b/JSTokenField/JSTokenField.m
@@ -373,10 +373,17 @@ - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRang
 		}
 		
 		NSString *name = [token titleForState:UIControlStateNormal];
+
 		// If we don't allow deleting the token, don't even bother letting it highlight
-		if ([self.delegate tokenField:self shouldRemoveToken:name representedObject:token.representedObject]) {
+		BOOL shouldHighlight = YES;
+		if ([self.delegate respondsToSelector:@selector(tokenField:shouldRemoveToken:representedObject:)]) {
+			shouldHighlight = [self.delegate tokenField:self shouldRemoveToken:name representedObject:token.representedObject];
+		}
+		
+		if (shouldHighlight) {
 			[token becomeFirstResponder];
 		}
+		
 		return NO;
 	}