removed ServiceNotFoundException