fix data service smashing + throw exception if service is not found