No more NPE when unloading a broken map