Added a check - if service exists, is it ok to return a ServiceNotFound exception here? If service isn't found?

As for tests, i've never written one, i'll give it a try a bit later.