diff --git a/Source/Core/GZBuilder/GZDoom/AcsParserSE.cs b/Source/Core/GZBuilder/GZDoom/AcsParserSE.cs
index a10e30a3..a9e67653 100644
--- a/Source/Core/GZBuilder/GZDoom/AcsParserSE.cs
+++ b/Source/Core/GZBuilder/GZDoom/AcsParserSE.cs
@@ -105,7 +105,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
 							}
 						}
 
-					} else if ((token == "#include" || token == "#import") && processIncludes) {
+					} else if (processIncludes && (token == "#include" || token == "#import")) {
 						SkipWhitespace(true);
 						string includeLump = StripTokenQuotes(ReadToken()).ToLowerInvariant();
 
diff --git a/Source/Core/ZDoom/ZDTextParser.cs b/Source/Core/ZDoom/ZDTextParser.cs
index 9e54c2e2..e11a8676 100644
--- a/Source/Core/ZDoom/ZDTextParser.cs
+++ b/Source/Core/ZDoom/ZDTextParser.cs
@@ -33,7 +33,7 @@ namespace CodeImp.DoomBuilder.ZDoom
 		#region ================== Variables
 		
 		// Parsing
-		protected string whitespace = "\n \t\r\u00A0"; //mxd. non-breaking space is also space :)
+		protected string whitespace = "\n \t\r\u00A0\0"; //mxd. non-breaking space is also space :)
 		protected string specialtokens = ":{}+-\n;";
 		
 		// Input data stream