fix commands view and error handling