*GeneralCommands: Fixed NullPointerExcept