fixed services error handling