[sr-dev] git:master:edbb5b11: ctl: refactored error handling and removed unnecessary code