CLI commands no longer crash