diff --git a/core/TextParsers.cpp b/core/TextParsers.cpp
index fb712c2f..0830ca2e 100644
--- a/core/TextParsers.cpp
+++ b/core/TextParsers.cpp
@@ -216,7 +216,10 @@ const char *FixupString(StringInfo &data)
 		}
 	}
 
-	*(data.end) = '\0';
+	if (data.end)
+	{
+		*(data.end) = '\0';
+	}
 
 	return data.ptr;
 }