diff --git a/drivers/gpu/nvgpu/common/acr/acr.c b/drivers/gpu/nvgpu/common/acr/acr.c
index a63d0d932..2d9f5f406 100644
--- a/drivers/gpu/nvgpu/common/acr/acr.c
+++ b/drivers/gpu/nvgpu/common/acr/acr.c
@@ -102,6 +102,9 @@ int nvgpu_acr_construct_execute(struct gk20a *g, struct nvgpu_acr *acr)
 	}
 
 	err = nvgpu_acr_bootstrap_hs_acr(g, acr);
+	if (err != 0) {
+		nvgpu_err(g, "Bootstrap HS ACR failed");
+	}
 
 done:
 	return err;
diff --git a/drivers/gpu/nvgpu/common/acr/acr_blob_construct_v1.c b/drivers/gpu/nvgpu/common/acr/acr_blob_construct_v1.c
index 9234e8baf..4ffb69647 100644
--- a/drivers/gpu/nvgpu/common/acr/acr_blob_construct_v1.c
+++ b/drivers/gpu/nvgpu/common/acr/acr_blob_construct_v1.c
@@ -103,6 +103,7 @@ int nvgpu_acr_lsf_fecs_ucode_details_v1(struct gk20a *g, void *lsf_ucode_img)
 			break;
 		default:
 			nvgpu_err(g, "no support for GPUID %x", ver);
+			break;
 	}
 
 	if (fecs_sig == NULL) {
@@ -192,6 +193,7 @@ int nvgpu_acr_lsf_gpccs_ucode_details_v1(struct gk20a *g, void *lsf_ucode_img)
 			break;
 		default:
 			nvgpu_err(g, "no support for GPUID %x", ver);
+			break;
 	}
 
 	if (gpccs_sig == NULL) {