diff --git a/TR5Main/Scripting/GameScriptNamedBase.h b/TR5Main/Scripting/GameScriptNamedBase.h
index 3c1ee3b63..7469928e9 100644
--- a/TR5Main/Scripting/GameScriptNamedBase.h
+++ b/TR5Main/Scripting/GameScriptNamedBase.h
@@ -3,13 +3,6 @@
 #include <functional>
 #include <string>
 
-
-#define index_error_maker(CPP_TYPE, LUA_CLASS_NAME) [](CPP_TYPE & item, sol::object key) \
-{ \
-	std::string err = "Attempted to read non-existant var \"" + key.as<std::string>() + "\" from " + LUA_CLASS_NAME; \
-	throw TENScriptException(err); \
-}
-
 template <typename S> using callbackSetName = std::function<bool(std::string const&, S identifier)>;
 using callbackRemoveName = std::function<bool(std::string const&)>;
 
diff --git a/TR5Main/Scripting/ScriptUtil.h b/TR5Main/Scripting/ScriptUtil.h
new file mode 100644
index 000000000..e9690389d
--- /dev/null
+++ b/TR5Main/Scripting/ScriptUtil.h
@@ -0,0 +1,13 @@
+#pragma once
+#define index_error_maker(CPP_TYPE, LUA_CLASS_NAME) [](CPP_TYPE & item, sol::object key) \
+{ \
+	std::string err = "Attempted to read non-existant var \"" + key.as<std::string>() + "\" from " + LUA_CLASS_NAME; \
+	ScriptAssert(false, err);\
+}
+
+#define newindex_error_maker(CPP_TYPE, LUA_CLASS_NAME) [](CPP_TYPE & item, sol::object key) \
+{ \
+	std::string err = "Attempted to set non-existant var \"" + key.as<std::string>() + "\" of " + LUA_CLASS_NAME; \
+	ScriptAssert(false, err);\
+}
+
diff --git a/TR5Main/TR5Main.vcxproj b/TR5Main/TR5Main.vcxproj
index 55db006c4..963ed4372 100644
--- a/TR5Main/TR5Main.vcxproj
+++ b/TR5Main/TR5Main.vcxproj
@@ -410,6 +410,7 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\"</Command>
     <ClInclude Include="Scripting\LuaHandler.h" />
     <ClInclude Include="Scripting\ObjectIDs.h" />
     <ClInclude Include="Scripting\ScriptAssert.h" />
+    <ClInclude Include="Scripting\ScriptUtil.h" />
     <ClInclude Include="Specific\configuration.h" />
     <ClInclude Include="Specific\IO\ChunkId.h" />
     <ClInclude Include="Specific\IO\ChunkWriter.h" />
diff --git a/TR5Main/TR5Main.vcxproj.filters b/TR5Main/TR5Main.vcxproj.filters
index 3af423eec..db350d76d 100644
--- a/TR5Main/TR5Main.vcxproj.filters
+++ b/TR5Main/TR5Main.vcxproj.filters
@@ -1050,6 +1050,9 @@
     <ClInclude Include="Scripting\ItemEnumPair.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
+    <ClInclude Include="Scripting\ScriptUtil.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Game\box.cpp">