Filter out components not constructed

1 files changed, 4 insertions, 1 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java
index 86e6bc4fa4a..8a07ef0ae14 100644
--- a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java
@@ -169,7 +169,10 @@ public class ComponentGraph {
     public List<Object> allConstructedComponentsAndProviders() {
         List<Node> orderedNodes = topologicalSort(nodes());
         Collections.reverse(orderedNodes);
-        return orderedNodes.stream().map(node -> node.constructedInstance().get()).collect(Collectors.toList());
+        return orderedNodes.stream()
+                .filter(node -> node.constructedInstance().isPresent())
+                .map(node -> node.constructedInstance().orElseThrow())
+                .collect(Collectors.toList());
     }
 
     private void completeComponentRegistryNode(ComponentRegistryNode registry) {