Reduced redundant checks in console commands