Moved error handling from server to command

remove this