diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs
index 79c0fd003..324c29a6a 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs
@@ -1003,11 +1003,10 @@ namespace Barotrauma
             {
                 Spawner.CreateNetworkEvent(newCharacter, false);
             }
+#endif
 
             GameMain.Lua.hook.Call("characterCreated", new object[] { newCharacter });
 
-#endif
-
             return newCharacter;
         }
 
diff --git a/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses.cs b/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses.cs
index be635384b..c3e1694b5 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses.cs
@@ -1033,9 +1033,16 @@ namespace Barotrauma
 
 			public void Update()
 			{
-				if (queuedFunctionCalls.TryDequeue(out Tuple<object, object[]> result))
+				try
 				{
-					env.CallFunction(result.Item1, result.Item2);
+					if (queuedFunctionCalls.TryDequeue(out Tuple<object, object[]> result))
+					{
+						env.CallFunction(result.Item1, result.Item2);
+					}
+				}
+				catch (Exception ex)
+				{
+					env.HandleLuaException(ex, $"queuedFunctionCalls was {queuedFunctionCalls}");
 				}
 			}