Fixed edge case where items could be dropped and improved reporting.