1 files changed, 6 insertions, 2 deletions
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java b/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java
index c2539b53b28..cc234ea51d7 100644
--- a/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java
+++ b/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java
@@ -98,8 +98,12 @@ public class CppClassBuilder implements ClassBuilder {
             String newHeader = headerWriter.toString();
             String newBody = bodyWriter.toString();
 
-            File headerFile = new File(rootDir, relativePathUnderRoot + "/" + getFileName(root, "h"));
-            File bodyFile = new File(rootDir, relativePathUnderRoot + "/" + getFileName(root, "cpp"));
+            String prefix = "";
+            if (relativePathUnderRoot != null) {
+                prefix = relativePathUnderRoot + "/";
+            }
+            File headerFile = new File(rootDir, prefix + getFileName(root, "h"));
+            File bodyFile = new File(rootDir, prefix + getFileName(root, "cpp"));
 
             writeFile(headerFile, newHeader);
             writeFile(bodyFile, newBody);