Better error handling
Return a response msg when service fails
before tidying up
Cleanup