Fix NPE in SimpleServiceFinder. Added generic parameter to use of Class in SimpleServiceFinder.