Changed the way services return errors