diff --git a/apps/openmw/mwlua/itemdata.cpp b/apps/openmw/mwlua/itemdata.cpp
index f2bd32703f..6dea2360e7 100644
--- a/apps/openmw/mwlua/itemdata.cpp
+++ b/apps/openmw/mwlua/itemdata.cpp
@@ -17,7 +17,7 @@ namespace
 
     void invalidPropErr(std::string_view prop, const MWWorld::Ptr& ptr)
     {
-        throw std::runtime_error(std::string(prop) + " does not exist for item "
+        throw std::runtime_error("'" + std::string(prop) + "'" + " property does not exist for item "
             + std::string(ptr.getClass().getName(ptr)) + "(" + std::string(ptr.getTypeDescription()) + ")");
     }
 }
@@ -96,11 +96,7 @@ namespace MWLua
                 }
                 else
                     invalidPropErr(prop, ptr);
-                return;
             }
-
-            /*ignore or error?*/
-            invalidPropErr(prop, ptr);
         }
     };
 }
diff --git a/apps/openmw/mwworld/cellref.hpp b/apps/openmw/mwworld/cellref.hpp
index a1ddd8d0f0..9595a4cc4c 100644
--- a/apps/openmw/mwworld/cellref.hpp
+++ b/apps/openmw/mwworld/cellref.hpp
@@ -130,7 +130,7 @@ namespace MWWorld
         }
         void setCharge(int charge);
         void setChargeFloat(float charge);
-        void applyChargeRemainderToBeSubtracted(float chargeRemainder); // Stores remainders and applies if > 1
+        void applyChargeRemainderToBeSubtracted(float chargeRemainder); // Stores remainders and applies if <= -1
 
         // Stores fractional part of mChargeInt
         void setChargeIntRemainder(float chargeRemainder);
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index 03efe885b5..b9a6958654 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -658,6 +658,15 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+---
+-- Set of properties that differentiates one item from another of the same record type.
+-- @function [parent=#Item] itemData
+-- @param openmw.core#GameObject item
+-- @return #ItemData
+
+---
+-- @type ItemData
+-- @field #number condition The item's current condition. Time remaining for lights. Uses left for lockpicks and probes. Current health for weapons and armor.
 
 --------------------------------------------------------------------------------
 -- @{#Creature} functions