diff --git a/mmv1/loader/loader.go b/mmv1/loader/loader.go
index 561623d3e702..89e8e9b513aa 100644
--- a/mmv1/loader/loader.go
+++ b/mmv1/loader/loader.go
@@ -54,7 +54,7 @@ func NewLoader(config Config) *Loader {
 	return l
 }
 
-func (l *Loader) LoadProducts() {
+func (l *Loader) LoadProducts() *Loader {
 	if l.version == "" {
 		log.Printf("No version specified, assuming ga")
 		l.version = "ga"
@@ -92,6 +92,8 @@ func (l *Loader) LoadProducts() {
 	}
 
 	l.Products = l.batchLoadProducts(allProductFiles)
+
+	return l
 }
 
 func (l *Loader) batchLoadProducts(productNames []string) map[string]*api.Product {
@@ -318,9 +320,9 @@ func (l *Loader) loadResource(product *api.Product, baseResourcePath string, ove
 	return resource
 }
 
-func (l *Loader) AddExtraFields() error {
+func (l *Loader) AddExtraFields() *Loader {
 	if l.Products == nil {
-		return errors.New("products have not been loaded into memory")
+		log.Fatalln("products have not been loaded into memory")
 	}
 
 	for _, product := range l.Products {
@@ -331,7 +333,7 @@ func (l *Loader) AddExtraFields() error {
 		}
 	}
 
-	return nil
+	return l
 }
 
 func (l *Loader) Validate() {
diff --git a/mmv1/main.go b/mmv1/main.go
index 3895a91d711f..03cb57e363df 100644
--- a/mmv1/main.go
+++ b/mmv1/main.go
@@ -90,8 +90,7 @@ func GenerateProducts(product, resource, providerName, version, outputPath, base
 	}
 
 	loader := loader.NewLoader(loader.Config{Version: version, BaseDirectory: baseDirectory, OverrideDirectory: overrideDirectory, Sysfs: ofs})
-	loader.LoadProducts()
-	loader.AddExtraFields()
+	loader.LoadProducts().AddExtraFields()
 	loader.Validate()
 	loadedProducts := loader.Products