Commands: better error handling