diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua
index 7589ead94..7f3c87660 100644
--- a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua
+++ b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua
@@ -81,6 +81,12 @@ RegisterBarotrauma("CharacterParams+SoundParams")
 
 RegisterBarotrauma("Item")
 RegisterBarotrauma("DeconstructItem")
+RegisterBarotrauma("PurchasedItem")
+RegisterBarotrauma("PurchasedItemSwap")
+RegisterBarotrauma("PurchasedUpgrade")
+RegisterBarotrauma("SoldItem")
+RegisterBarotrauma("UpgradeManager")
+RegisterBarotrauma("CargoManager")
 RegisterBarotrauma("FabricationRecipe")
 RegisterBarotrauma("PreferredContainer")
 RegisterBarotrauma("SwappableItem")
diff --git a/Barotrauma/BarotraumaShared/Lua/LuaSetup.lua b/Barotrauma/BarotraumaShared/Lua/LuaSetup.lua
index 7c2aae69a..89c9216e0 100644
--- a/Barotrauma/BarotraumaShared/Lua/LuaSetup.lua
+++ b/Barotrauma/BarotraumaShared/Lua/LuaSetup.lua
@@ -42,14 +42,23 @@ if not CSActive then
     LuaUserData.RegisterType = function (typeName)
         local descriptor = Descriptors[typeName]
 
-        print(typeName)
-
         if descriptor == nil then
             error("Type '" .. typeName .. "' can't be registered", 2)
         else
             return descriptor
         end
     end
+
+    local originalCreateStatic = LuaUserData.CreateStatic
+    LuaUserData.CreateStatic = function (typeName, addCallMethod)
+        local descriptor = Descriptors[typeName]
+
+        if descriptor == nil then
+            error("Unable to create static reference to type " .. typeName, 2)
+        end
+
+        return originalCreateStatic(typeName, addCallMethod)
+    end
 end
 
 LuaSetup = nil