diff --git a/operators/endpointmetrics/pkg/microshift/microshift.go b/operators/endpointmetrics/pkg/microshift/microshift.go
index e249f724f..850eecc07 100644
--- a/operators/endpointmetrics/pkg/microshift/microshift.go
+++ b/operators/endpointmetrics/pkg/microshift/microshift.go
@@ -135,7 +135,7 @@ func (m *Microshift) renderScrapeConfig(res []*unstructured.Unstructured) error
 
 	// Append additional scrape config for etcd on the host
 	// We don't unmarshal the existing scrape config to avoid adding default values
-	// when marshalling the new scrape config. Instead, we append the new scrape config
+	// when marshaling the new scrape config. Instead, we append the new scrape config
 	// to the existing scrape config.
 	var ret strings.Builder
 	ret.WriteString(strings.TrimSpace(scrapeSecret.StringData[scrapeConfigKey]))
diff --git a/operators/pkg/deploying/deployer.go b/operators/pkg/deploying/deployer.go
index 65934297d..fda88b447 100644
--- a/operators/pkg/deploying/deployer.go
+++ b/operators/pkg/deploying/deployer.go
@@ -374,6 +374,10 @@ func (d *Deployer) updateAddOnDeploymentConfig(
 	desiredObj, runtimeObj *unstructured.Unstructured,
 ) error {
 	desiredAODC, runtimeAODC, err := unstructuredPairToTyped[addonv1alpha1.AddOnDeploymentConfig](desiredObj, runtimeObj)
+	if err != nil {
+		return err
+	}
+
 	if !apiequality.Semantic.DeepDerivative(desiredAODC.Spec, runtimeAODC.Spec) {
 		logUpdateInfo(runtimeObj)
 		if desiredAODC.ResourceVersion != runtimeAODC.ResourceVersion {
@@ -390,6 +394,10 @@ func (d *Deployer) updateClusterManagementAddOn(
 	desiredObj, runtimeObj *unstructured.Unstructured,
 ) error {
 	desiredCMAO, runtimeCMAO, err := unstructuredPairToTyped[addonv1alpha1.ClusterManagementAddOn](desiredObj, runtimeObj)
+	if err != nil {
+		return err
+	}
+
 	if !apiequality.Semantic.DeepDerivative(desiredCMAO.Spec, runtimeCMAO.Spec) {
 		logUpdateInfo(runtimeObj)
 		if desiredCMAO.ResourceVersion != runtimeCMAO.ResourceVersion {