Throw exception if a config instance is null or missing.

1 files changed, 8 insertions, 1 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/di/CloudSubscriber.java b/container-core/src/main/java/com/yahoo/container/di/CloudSubscriber.java
index e751c33b5d0..0247cda8bbd 100644
--- a/container-core/src/main/java/com/yahoo/container/di/CloudSubscriber.java
+++ b/container-core/src/main/java/com/yahoo/container/di/CloudSubscriber.java
@@ -51,7 +51,14 @@ public class CloudSubscriber  implements Subscriber {
     @Override
     public Map<ConfigKey<ConfigInstance>, ConfigInstance> config() {
         Map<ConfigKey<ConfigInstance>, ConfigInstance> ret = new HashMap<>();
-        handles.forEach((k, v) -> ret.put(k, v.getConfig()));
+        handles.forEach((k, v) -> {
+            ConfigInstance config = v.getConfig();
+            if (config == null) {
+                throw new IllegalArgumentException("Got a null config from the config system for key: " + k +
+                        "\nConfig handle: " + v);
+            }
+            ret.put(k, config);
+        });
         return ret;
     }