Added null guard to get featureTypeByClient.