Merge "Add handling of missing ServiceSpecificException"