diff --git a/AssetUtils.cs b/AssetUtils.cs
index 54a3da1..8610d77 100644
--- a/AssetUtils.cs
+++ b/AssetUtils.cs
@@ -665,7 +665,7 @@ public static void findBspUtilityFiles(BSP bsp, List<string> sourceDirectories,
             }
 
             // detail file (.vbsp)
-            Dictionary<string, string> worldspawn = bsp.entityList.First(item => item["classname"] == "worldspawn");
+            Dictionary<string, string> worldspawn = bsp.entityList.FirstOrDefault(item => item["classname"] == "worldspawn", new Dictionary<string, string>());
             if (worldspawn.ContainsKey("detailvbsp"))
             {
                 internalPath = worldspawn["detailvbsp"];
diff --git a/BSP.cs b/BSP.cs
index eee5aa9..786786a 100644
--- a/BSP.cs
+++ b/BSP.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using ValveKeyValue;
 
 namespace BSPPackStandalone
 {
@@ -151,7 +152,8 @@ public void buildEntityList(FileStream bsp, BinaryReader reader)
                     {
                         if (s.Count() != 0)
                         {
-                            string[] c = s.Split('"');
+                            // split on non escaped quotes
+                            string[] c = Regex.Split(s, "(?<!\\\\)[\"\"]");
                             if (!entity.ContainsKey(c[1]))
                                 entity.Add(c[1], c[3]);
                             entityArrayFormat.Add(Tuple.Create(c[1], c[3]));
@@ -184,7 +186,7 @@ public void buildTextureList(FileStream bsp, BinaryReader reader)
             }
 
             // find skybox materials
-            Dictionary<string, string> worldspawn = entityList.First(item => item["classname"] == "worldspawn");
+            Dictionary<string, string> worldspawn = entityList.FirstOrDefault(item => item["classname"] == "worldspawn", new Dictionary<string, string>());
             if (worldspawn.ContainsKey("skyname"))
                 foreach (string s in new string[] { "", "bk", "dn", "ft", "lf", "rt", "up" })
                 {
diff --git a/bspPack.csproj b/bspPack.csproj
index 62c6870..9b08f3b 100644
--- a/bspPack.csproj
+++ b/bspPack.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
-	<Version>0.3.1</Version>
+	<Version>0.3.2</Version>
 	<RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
 	<SelfContained>true</SelfContained>
     <ImplicitUsings>enable</ImplicitUsings>