fixed NPE when dropping empty blocks, happens when cleaning orphans (fixes 5410)