fixed params, exception catches and added service