Started to refactor commands to use exceptions