diff --git a/src/NHibernate/Engine/Query/ParameterParser.cs b/src/NHibernate/Engine/Query/ParameterParser.cs
index 50287a5de0..c60dc7924a 100644
--- a/src/NHibernate/Engine/Query/ParameterParser.cs
+++ b/src/NHibernate/Engine/Query/ParameterParser.cs
@@ -55,7 +55,8 @@ public static void Parse(string sqlString, IRecognizer recognizer)
 				// check comments, unless in quote or at end of string
 				if (!inQuote && indx + 1 < stringLength)
 				{
-					if (indx + 1 < stringLength && sqlString.Substring(indx, 2) == "/*")
+					var candidateOpenCommentToken = sqlString.Substring(indx, 2);
+					if (candidateOpenCommentToken == "/*")
 					{
 						var closeCommentIdx = sqlString.IndexOf("*/", indx + 2, StringComparison.Ordinal);
 						recognizer.Other(sqlString.Substring(indx, (closeCommentIdx - indx) + 2));