Better handling of service related errors