diff --git a/res/content/base/modules/util.lua b/res/content/base/modules/util.lua
index 4d25ccb91..57bc6ccb6 100644
--- a/res/content/base/modules/util.lua
+++ b/res/content/base/modules/util.lua
@@ -1,20 +1,21 @@
 local util = {}
 
 local DROP_FORCE = 8
-local DROP_INIT_VEL = {0, 3, 0}
+local DROP_INIT_VEL = { 0, 3, 0 }
 
+--- Create a drop from slot, set it velocity, and return it
 ---@param mode integer 0 - whole stack, 1 - single item, 2 - dupe whole stack
-function util.drop_from_slot(invid, slot, mode)
+---@return table? entity, string? error
+function util.drop_from_slot(pid, invid, slot, mode)
     if invid == 0 then
-        return
+        return nil, "invid cannot be 0"
     end
-    local pid = hud.get_player()
     if mode == 2 and not player.is_infinite_items(pid) then
-        return
+        return nil, "no permission to dupe items"
     end
     local itemid, itemcount = inventory.get(invid, slot)
     if itemid == 0 then
-        return
+        return nil, "no item in slot"
     end
 
     local drop_itemcount = 1
@@ -31,24 +32,28 @@ function util.drop_from_slot(invid, slot, mode)
     local pvel = { player.get_vel(pid) }
     local ppos = vec3.add({ player.get_pos(pid) }, { 0, 0.7, 0 })
     local throw_force = vec3.mul(player.get_dir(pid), DROP_FORCE)
-    local drop = util.drop(ppos, itemid, drop_itemcount, data, 1.5)
+    local drop, err = util.drop(ppos, itemid, drop_itemcount, data, 1.5)
     if not drop then
-        return
+        return nil, err
     end
     local velocity = vec3.add(throw_force, vec3.add(pvel, DROP_INIT_VEL))
     drop.rigidbody:set_vel(velocity)
+    return drop
 end
 
+---@return table? entity, string? error
 function util.drop(ppos, itemid, count, data, pickup_delay)
     if itemid == 0 or not itemid then
-        return nil
+        return nil, "item is empty"
     end
-    return entities.spawn("base:drop", ppos, {base__drop={
-        id=itemid,
-        count=count,
-        data=data,
-        pickup_delay=pickup_delay
-    }})
+    return entities.spawn("base:drop", ppos, {
+        base__drop = {
+            id = itemid,
+            count = count,
+            data = data,
+            pickup_delay = pickup_delay
+        }
+    })
 end
 
 function util.calc_loot(loot_table)
@@ -66,7 +71,9 @@ function util.calc_loot(loot_table)
             if count == 0 then
                 goto continue
             end
-            table.insert(results, {item=item.index(loot.item), count=count})
+            table.insert(results, {
+                item = item.index(loot.item), count = count
+            })
         end
         ::continue::
     end
@@ -78,7 +85,7 @@ function util.block_loot(blockid)
     if lootscheme then
         return util.calc_loot(lootscheme)
     end
-    return {{item=block.get_picking_item(blockid), count=1}}
+    return { { item = block.get_picking_item(blockid), count = 1 } }
 end
 
 return util
diff --git a/res/content/base/scripts/hud.lua b/res/content/base/scripts/hud.lua
index d0e3d1532..313e7b5b4 100644
--- a/res/content/base/scripts/hud.lua
+++ b/res/content/base/scripts/hud.lua
@@ -2,8 +2,9 @@ local base_util = require "util"
 
 function on_hud_open()
     events.on("core:drop_outside_inventory", function(mode)
+        local pid = hud.get_player()
         local invid = hud.get_exchange_inventory()
-        base_util.drop_from_slot(invid, 0, mode)
+        base_util.drop_from_slot(pid, invid, 0, mode)
     end)
     input.add_callback("player.drop", function()
         if hud.is_paused() or hud.is_inventory_open() then
@@ -13,9 +14,9 @@ function on_hud_open()
         local invid, slot = player.get_inventory(pid)
         local mode = 1
         if input.is_pressed("key:left-ctrl") or input.is_pressed("key:right-ctrl") then
-          mode = 0
+            mode = 0
         end
-        base_util.drop_from_slot(invid, slot, mode)
+        base_util.drop_from_slot(pid, invid, slot, mode)
     end)
     rules.create("do-loot-non-player", true)
 end