Detect bad component reference

1 files changed, 7 insertions, 1 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminMain.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminMain.java
index 46a04d71b92..6fd6b0c906c 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminMain.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminMain.java
@@ -77,7 +77,13 @@ public class NodeAdminMain implements AutoCloseable {
             });
 
             for (String componentSpecificationString : config.components) {
-                enable(adminRegistry.getComponent(componentSpecificationString));
+                AdminComponent component =
+                        adminRegistry.getComponent(componentSpecificationString);
+                if (component == null) {
+                    throw new IllegalArgumentException("There is no component named '" +
+                            componentSpecificationString + "'");
+                }
+                enable(component);
             }
         }
     }