diff --git a/imgbom/presenter/json/imgs/presenter.go b/imgbom/presenter/json/imgs/presenter.go
index 8782a5afc..7efaada71 100644
--- a/imgbom/presenter/json/imgs/presenter.go
+++ b/imgbom/presenter/json/imgs/presenter.go
@@ -2,6 +2,7 @@ package imgs
 
 import (
 	"encoding/json"
+	"fmt"
 	"io"
 
 	"github.com/anchore/imgbom/imgbom/pkg"
@@ -82,6 +83,7 @@ func (pres *Presenter) Present(output io.Writer) error {
 	}
 
 	// populate artifacts...
+	// TODO: move this into a common package so that other text presenters can reuse
 	for p := range pres.catalog.Enumerate() {
 		art := artifact{
 			Name:     p.Name,
@@ -96,12 +98,11 @@ func (pres *Presenter) Present(output io.Writer) error {
 			var layer int
 			if err != nil {
 				// TODO: test case
-				log.Errorf("could not get metadata from catalog (presenter=json): %+v - error: %w", src, err)
-				layer = 0
-			} else {
-				layer = int(fileMetadata.Source.Metadata.Index)
+				return fmt.Errorf("could not get metadata from catalog (presenter=json src=%v): %w", src, err)
 			}
 
+			layer = int(fileMetadata.Source.Metadata.Index)
+
 			srcObj := source{
 				FoundBy: p.FoundBy,
 				Layer:   layer,
diff --git a/imgbom/presenter/json/presenter_test.go b/imgbom/presenter/json/imgs/presenter_test.go
similarity index 99%
rename from imgbom/presenter/json/presenter_test.go
rename to imgbom/presenter/json/imgs/presenter_test.go
index cb04a33ac..1f174bb1f 100644
--- a/imgbom/presenter/json/presenter_test.go
+++ b/imgbom/presenter/json/imgs/presenter_test.go
@@ -1,4 +1,4 @@
-package json
+package imgs
 
 import (
 	"bytes"
diff --git a/imgbom/presenter/json/test-fixtures/image-simple/Dockerfile b/imgbom/presenter/json/imgs/test-fixtures/image-simple/Dockerfile
similarity index 100%
rename from imgbom/presenter/json/test-fixtures/image-simple/Dockerfile
rename to imgbom/presenter/json/imgs/test-fixtures/image-simple/Dockerfile
diff --git a/imgbom/presenter/json/test-fixtures/image-simple/file-1.txt b/imgbom/presenter/json/imgs/test-fixtures/image-simple/file-1.txt
similarity index 100%
rename from imgbom/presenter/json/test-fixtures/image-simple/file-1.txt
rename to imgbom/presenter/json/imgs/test-fixtures/image-simple/file-1.txt
diff --git a/imgbom/presenter/json/test-fixtures/image-simple/file-2.txt b/imgbom/presenter/json/imgs/test-fixtures/image-simple/file-2.txt
similarity index 100%
rename from imgbom/presenter/json/test-fixtures/image-simple/file-2.txt
rename to imgbom/presenter/json/imgs/test-fixtures/image-simple/file-2.txt
diff --git a/imgbom/presenter/json/test-fixtures/image-simple/target/really/nested/file-3.txt b/imgbom/presenter/json/imgs/test-fixtures/image-simple/target/really/nested/file-3.txt
similarity index 100%
rename from imgbom/presenter/json/test-fixtures/image-simple/target/really/nested/file-3.txt
rename to imgbom/presenter/json/imgs/test-fixtures/image-simple/target/really/nested/file-3.txt
diff --git a/imgbom/presenter/json/test-fixtures/snapshot/TestJsonPresenter.golden b/imgbom/presenter/json/imgs/test-fixtures/snapshot/TestJsonPresenter.golden
similarity index 100%
rename from imgbom/presenter/json/test-fixtures/snapshot/TestJsonPresenter.golden
rename to imgbom/presenter/json/imgs/test-fixtures/snapshot/TestJsonPresenter.golden
diff --git a/imgbom/presenter/json/test-fixtures/snapshot/anchore-fixture-image-simple.golden b/imgbom/presenter/json/imgs/test-fixtures/snapshot/anchore-fixture-image-simple.golden
similarity index 100%
rename from imgbom/presenter/json/test-fixtures/snapshot/anchore-fixture-image-simple.golden
rename to imgbom/presenter/json/imgs/test-fixtures/snapshot/anchore-fixture-image-simple.golden