diff --git a/bundle/config/mutator/capture_schema_dependency.go b/bundle/config/mutator/capture_schema_dependency.go
index 2a96fc6e2..e91085790 100644
--- a/bundle/config/mutator/capture_schema_dependency.go
+++ b/bundle/config/mutator/capture_schema_dependency.go
@@ -32,7 +32,7 @@ func findSchema(b *bundle.Bundle, catalogName, schemaName string) (string, *reso
 	}
 
 	for k, s := range b.Config.Resources.Schemas {
-		if s.CreateSchema != nil && s.CatalogName == catalogName && s.Name == schemaName {
+		if s != nil && s.CreateSchema != nil && s.CatalogName == catalogName && s.Name == schemaName {
 			return k, s
 		}
 	}
@@ -40,6 +40,9 @@ func findSchema(b *bundle.Bundle, catalogName, schemaName string) (string, *reso
 }
 
 func resolveVolume(v *resources.Volume, b *bundle.Bundle) {
+	if v == nil {
+		return
+	}
 	if v.CreateVolumeRequestContent == nil {
 		return
 	}
@@ -52,6 +55,9 @@ func resolveVolume(v *resources.Volume, b *bundle.Bundle) {
 }
 
 func resolvePipelineSchema(p *resources.Pipeline, b *bundle.Bundle) {
+	if p == nil {
+		return
+	}
 	if p.PipelineSpec == nil {
 		return
 	}
@@ -67,6 +73,9 @@ func resolvePipelineSchema(p *resources.Pipeline, b *bundle.Bundle) {
 }
 
 func resolvePipelineTarget(p *resources.Pipeline, b *bundle.Bundle) {
+	if p == nil {
+		return
+	}
 	if p.PipelineSpec == nil {
 		return
 	}
diff --git a/bundle/config/mutator/capture_schema_dependency_test.go b/bundle/config/mutator/capture_schema_dependency_test.go
index b26b1eaca..0a94e7748 100644
--- a/bundle/config/mutator/capture_schema_dependency_test.go
+++ b/bundle/config/mutator/capture_schema_dependency_test.go
@@ -36,10 +36,8 @@ func TestCaptureSchemaDependencyForVolume(t *testing.T) {
 							Name:        "barfoo",
 						},
 					},
-					"nilschema": {},
-					"emptyschema": {
-						CreateSchema: &catalog.CreateSchema{},
-					},
+					"nilschema":   nil,
+					"emptyschema": {},
 				},
 				Volumes: map[string]*resources.Volume{
 					"volume1": {
@@ -72,10 +70,8 @@ func TestCaptureSchemaDependencyForVolume(t *testing.T) {
 							SchemaName:  "schemaX",
 						},
 					},
-					"nilVolume": {},
-					"emptyVolume": {
-						CreateVolumeRequestContent: &catalog.CreateVolumeRequestContent{},
-					},
+					"nilVolume":   nil,
+					"emptyVolume": {},
 				},
 			},
 		},
@@ -90,8 +86,8 @@ func TestCaptureSchemaDependencyForVolume(t *testing.T) {
 	assert.Equal(t, "foobar", b.Config.Resources.Volumes["volume4"].CreateVolumeRequestContent.SchemaName)
 	assert.Equal(t, "schemaX", b.Config.Resources.Volumes["volume5"].CreateVolumeRequestContent.SchemaName)
 
-	assert.Nil(t, b.Config.Resources.Volumes["nilVolume"].CreateVolumeRequestContent)
-	assert.Empty(t, b.Config.Resources.Volumes["emptyVolume"].CreateVolumeRequestContent)
+	assert.Nil(t, b.Config.Resources.Volumes["nilVolume"])
+	assert.Nil(t, b.Config.Resources.Volumes["emptyVolume"].CreateVolumeRequestContent)
 }
 
 func TestCaptureSchemaDependencyForPipelinesWithTarget(t *testing.T) {
@@ -117,10 +113,8 @@ func TestCaptureSchemaDependencyForPipelinesWithTarget(t *testing.T) {
 							Name:        "barfoo",
 						},
 					},
-					"nilschema": {},
-					"emptyschema": {
-						CreateSchema: &catalog.CreateSchema{},
-					},
+					"nilschema":   nil,
+					"emptyschema": {},
 				},
 				Pipelines: map[string]*resources.Pipeline{
 					"pipeline1": {
@@ -166,10 +160,8 @@ func TestCaptureSchemaDependencyForPipelinesWithTarget(t *testing.T) {
 							Name:    "whatever",
 						},
 					},
-					"nilPipeline": {},
-					"emptyPipeline": {
-						PipelineSpec: &pipelines.PipelineSpec{},
-					},
+					"nilPipeline":   nil,
+					"emptyPipeline": {},
 				},
 			},
 		},
@@ -186,8 +178,8 @@ func TestCaptureSchemaDependencyForPipelinesWithTarget(t *testing.T) {
 	assert.Equal(t, "foobar", b.Config.Resources.Pipelines["pipeline6"].Schema)
 	assert.Equal(t, "", b.Config.Resources.Pipelines["pipeline7"].Schema)
 
-	assert.Nil(t, b.Config.Resources.Pipelines["nilPipeline"].PipelineSpec)
-	assert.Empty(t, b.Config.Resources.Pipelines["emptyPipeline"].PipelineSpec)
+	assert.Nil(t, b.Config.Resources.Pipelines["nilPipeline"])
+	assert.Nil(t, b.Config.Resources.Pipelines["emptyPipeline"].PipelineSpec)
 
 	for _, k := range []string{"pipeline1", "pipeline2", "pipeline3", "pipeline4", "pipeline5", "pipeline6", "pipeline7"} {
 		assert.Empty(t, b.Config.Resources.Pipelines[k].Target)
@@ -217,10 +209,8 @@ func TestCaptureSchemaDependencyForPipelinesWithSchema(t *testing.T) {
 							Name:        "barfoo",
 						},
 					},
-					"nilschema": {},
-					"emptyschema": {
-						CreateSchema: &catalog.CreateSchema{},
-					},
+					"nilschema":   nil,
+					"emptyschema": {},
 				},
 				Pipelines: map[string]*resources.Pipeline{
 					"pipeline1": {