Fix 'unable to drop null item'