Fix broken commit. No longer crashing but still setting shape to null to fix visual glitch.