Simplify

1 files changed, 3 insertions, 7 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
index 8c79b67f861..f03c80b4f78 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
@@ -132,16 +132,12 @@ public class DeployState implements ConfigDefinitionStore {
             }
             existingConfigDefs.putAll(applicationPackage.getAllExistingConfigDefs());
         }
-        ConfigDefinitionKey lookupKey = defKey;
+        if ( ! existingConfigDefs.containsKey(defKey)) return Optional.empty();
 
-        if ( ! existingConfigDefs.containsKey(lookupKey)) {
-            throw new IllegalArgumentException("Could not find a config definition with name '" + defKey + "'.");
-        }
-        if (defArchive.get(defKey) != null) {
+        if (defArchive.get(defKey) != null)
             return Optional.ofNullable(defArchive.get(defKey));
-        }
 
-        ConfigDefinition def = existingConfigDefs.get(lookupKey).parse();
+        ConfigDefinition def = existingConfigDefs.get(defKey).parse();
 
         defArchive.put(defKey, def);
         return Optional.ofNullable(def);