more informative exception message

2 files changed, 5 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/SDDocumentTypeOrderer.java b/config-model/src/main/java/com/yahoo/searchdefinition/SDDocumentTypeOrderer.java
index ba34045e7de..848631f1739 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/SDDocumentTypeOrderer.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/SDDocumentTypeOrderer.java
@@ -81,7 +81,10 @@ public class SDDocumentTypeOrderer {
             }
             else {
                 inherited = createdSDTypes.get(name);
-                if (inherited == null) throw new IllegalArgumentException("Document type '" + name + "' not found");
+                if (inherited == null) {
+                    throw new IllegalArgumentException("document " + type.getName() +
+                                                       " inherits from unavailable document " + name);
+                }
                 process(inherited, inherited);
             }
             type.inherit(inherited);
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java
index bcf68387294..3bd1e568400 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java
@@ -54,7 +54,7 @@ public class InheritanceTestCase extends AbstractExportingTestCase {
         try {
             assertCorrectDeriving("inheritfromnull");
         } catch (IllegalArgumentException e) {
-            assertEquals("Document type 'foo' not found", e.getMessage());
+            assertEquals("document inheritfromnull inherits from unavailable document foo", e.getMessage());
         }
     }