Error handling improved (service requests)