Adding error check to service
Cleaning repo