clean-up and fixing a possible NPE for summon/warp