/controllers/: rollbacked on timeout and added proper error handling