Fixed remaining NPE's in commands