Moved error handling from server to command
Addressed my imaginary selves' comments
Merge pull request #6 from gbbr/121-handle-errors-in-cmd

Moved error handling from server to command