diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/actuator/FeaturesEndpoint.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/actuator/FeaturesEndpoint.java
index 1cb5464d..3958ffa5 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/actuator/FeaturesEndpoint.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/actuator/FeaturesEndpoint.java
@@ -55,20 +55,22 @@ public class FeaturesEndpoint extends AbstractEndpoint<FeaturesEndpoint.Features
 	}
 
 	private void addAbstractFeature(Features features, Class type) {
-		addFeature(features, new NamedFeature(type.getSimpleName(), type));
+		String featureName = type.getSimpleName();
+		try {
+			Object bean = context.getBean(type);
+			Class<?> beanClass = bean.getClass();
+			addFeature(features, new NamedFeature(featureName, beanClass));
+		} catch (NoSuchBeanDefinitionException e) {
+			features.getDisabled().add(featureName);
+		}
 	}
 
 	private void addFeature(Features features, NamedFeature feature) {
-		try {
-			Object bean = context.getBean(feature.getType());
-			Class<?> beanClass = bean.getClass();
+			Class<?> type = feature.getType();
 			features.getEnabled().add(new Feature(feature.getName(),
-					beanClass.getCanonicalName(),
-					beanClass.getPackage().getImplementationVersion(),
-					beanClass.getPackage().getImplementationVendor()));
-		} catch (NoSuchBeanDefinitionException e) {
-			features.getDisabled().add(feature.getName());
-		}
+					type.getCanonicalName(),
+					type.getPackage().getImplementationVersion(),
+					type.getPackage().getImplementationVendor()));
 	}
 
 	@Value
diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java
index 31bce206..b96e3496 100644
--- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java
+++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java
@@ -55,11 +55,6 @@ public class FeaturesEndpointTests {
 			return new Foo();
 		}
 
-		@Bean
-		Bar bar() {
-			return new Bar();
-		}
-
 		@Bean
 		HasFeatures localFeatures() {
 			return HasFeatures.builder()