diff --git a/entities.lua b/entities.lua
index 96f9f94..d3c6a3e 100755
--- a/entities.lua
+++ b/entities.lua
@@ -601,7 +601,8 @@ minetest.register_entity("ap_airship:airship", {
             self.object:set_properties(properties)
             if data.remove then
                 airutils.destroy_inventory(self)
-                ap_airship.destroy(self)
+                self.object:remove()
+                --ap_airship.destroy(self)
                 return
             end
         end
diff --git a/utilities.lua b/utilities.lua
index 1a790f6..2162d3c 100755
--- a/utilities.lua
+++ b/utilities.lua
@@ -321,7 +321,7 @@ function ap_airship.destroy(self, overload)
     if self._cabin2 then self._cabin2:remove() end
 
     airutils.destroy_inventory(self)
-    local autofly = self._autoflymode
+    local autofly = self._autoflymode or false
     self.object:remove()
 
     pos.y=pos.y+2
@@ -357,7 +357,7 @@ function ap_airship.destroy(self, overload)
         local boat_wear = math.floor(65535*(1-(self.hull_integrity/item_def.hull_integrity)))
         stack:set_wear(boat_wear)
     end
-    if not autofly then
+    if autofly == false then
         minetest.add_item({x=pos.x+math.random()-0.5,y=pos.y,z=pos.z+math.random()-0.5}, stack)
     end
 end