diff --git a/src/dsql/Parser.cpp b/src/dsql/Parser.cpp
index bbfda00f106..f86bb984697 100644
--- a/src/dsql/Parser.cpp
+++ b/src/dsql/Parser.cpp
@@ -783,14 +783,8 @@ int Parser::yylexAux()
 		// Time to scan the string. Make sure the characters are legal,
 		// and find out how long the hex digit string is.
 
-		for (;;)
+		while (lex.ptr < lex.end)
 		{
-			if (charlen == 0 && lex.ptr >= lex.end)			// Unexpected EOS
-			{
-				hexerror = true;
-				break;
-			}
-
 			c = *lex.ptr;
 
 			if (!(classes(c) & CHR_HEX))	// End of digit string