diff --git a/pkg/app/app_reconcile_test.go b/pkg/app/app_reconcile_test.go
index 1d2cc21ea..b1dbefcc6 100644
--- a/pkg/app/app_reconcile_test.go
+++ b/pkg/app/app_reconcile_test.go
@@ -79,7 +79,6 @@ func Test_NoInspectReconcile_IfNoDeployAttempted(t *testing.T) {
 }
 
 func Test_NoInspectReconcile_IfInspectNotEnabled(t *testing.T) {
-	t.Skipf("")
 	log := logf.Log.WithName("kc")
 	var appMetrics = metrics.NewAppMetrics()
 
diff --git a/pkg/deploy/factory.go b/pkg/deploy/factory.go
index 6537b3fde..7830f54c3 100644
--- a/pkg/deploy/factory.go
+++ b/pkg/deploy/factory.go
@@ -63,7 +63,7 @@ func (f Factory) NewKapp(opts v1alpha1.AppDeployKapp, saName string,
 	}
 
 	return NewKapp(suffix, opts, processedGenericOpts,
-		f.globalKappDeployRawOpts(), cancelCh, f.cmdRunner, f.coreClient.CoreV1().ConfigMaps("kappctrl-test")), nil
+		f.globalKappDeployRawOpts(), cancelCh, f.cmdRunner, f.coreClient.CoreV1().ConfigMaps(genericOpts.Namespace)), nil
 }
 
 // NewKappPrivileged is used for package repositories where users aren't required to provide
diff --git a/pkg/deploy/kapp.go b/pkg/deploy/kapp.go
index 9e52e53d4..d201d7a8a 100644
--- a/pkg/deploy/kapp.go
+++ b/pkg/deploy/kapp.go
@@ -135,16 +135,19 @@ func (a *Kapp) InternalAppConfigMap() (*corev1.ConfigMap, error) {
 	var configMap *corev1.ConfigMap
 
 	metadataFile, err := ioutil.ReadFile(fmt.Sprintf("/etc/kappctrl-mem-tmp/metadata-%s", a.genericOpts.Name))
-	if os.IsNotExist(err) {
+	switch {
+	case os.IsNotExist(err) && a.maps != nil:
 		configMap, err = a.maps.Get(context.TODO(), a.genericOpts.Name+a.appSuffix, metav1.GetOptions{})
 		if err != nil {
 			return nil, err
 		}
-	} else {
+	case err == nil:
 		configMap = &corev1.ConfigMap{Data: map[string]string{"spec": string(metadataFile)}}
 		if err != nil {
 			return nil, err
 		}
+	default:
+		return nil, err
 	}
 
 	return configMap, nil