Added NPE checks
Magic wand tool is no longer hidden