Refactoring command
Refactoring command
add exception