Fixed nullPointer when commandMgr isn't set