diff --git a/IDEHelper/Compiler/BfReducer.cpp b/IDEHelper/Compiler/BfReducer.cpp
index 60657756..dc6471da 100644
--- a/IDEHelper/Compiler/BfReducer.cpp
+++ b/IDEHelper/Compiler/BfReducer.cpp
@@ -7568,14 +7568,20 @@ BfInitializerExpression* BfReducer::TryCreateInitializerExpression(BfAstNode* ta
 			bool foundComma = false;
 
 			node = mVisitorPos.GetCurrent();
-			if (auto tokenNode = BfNodeDynCast<BfTokenNode>(node))
+			if (node != NULL)
 			{
-				if (tokenNode->mToken == BfToken_Comma)
+				if (auto tokenNode = BfNodeDynCast<BfTokenNode>(node))
 				{
-					foundComma = true;
-					commas.Add(tokenNode);
-					isDone = !mVisitorPos.MoveNext();
+					if (tokenNode->mToken == BfToken_Comma)
+					{
+						foundComma = true;
+						commas.Add(tokenNode);
+						isDone = !mVisitorPos.MoveNext();
+					}
 				}
+
+				if (!foundComma)
+					Fail("Expected ','", node);
 			}
 		}
 	}