diff --git a/api/appStore/deployment/AppStoreDeploymentRestHandler.go b/api/appStore/deployment/AppStoreDeploymentRestHandler.go
index 119c74e157..7b8118b023 100644
--- a/api/appStore/deployment/AppStoreDeploymentRestHandler.go
+++ b/api/appStore/deployment/AppStoreDeploymentRestHandler.go
@@ -415,6 +415,10 @@ func (handler AppStoreDeploymentRestHandlerImpl) UpdateInstalledApp(w http.Respo
 	handler.Logger.Debugw("request payload, UpdateInstalledApp", "payload", request)
 	installedApp, err := handler.appStoreDeploymentDBService.GetInstalledApp(request.InstalledAppId)
 	if err != nil {
+		if util.IsErrNoRows(err) {
+			common.HandleResourceNotFound(w, r, "installedApp", strconv.Itoa(request.InstalledAppVersionId))
+			return
+		}
 		handler.Logger.Errorw("service err, UpdateInstalledApp", "err", err, "payload", request)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
@@ -461,6 +465,8 @@ func (handler AppStoreDeploymentRestHandlerImpl) UpdateInstalledApp(w http.Respo
 	if err != nil {
 		if strings.Contains(err.Error(), "application spec is invalid") {
 			err = &util.ApiError{Code: "400", HttpStatusCode: 400, UserMessage: "application spec is invalid, please check provided chart values"}
+		} else if util.IsErrNoRows(err) {
+			handler.Logger.Errorw("installed app not found", "err", err, "payload", request)
 		}
 		handler.Logger.Errorw("service err, UpdateInstalledApp", "err", err, "payload", request)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
diff --git a/api/restHandler/ConfigMapRestHandler.go b/api/restHandler/ConfigMapRestHandler.go
index bd4278662b..ed7fefd468 100644
--- a/api/restHandler/ConfigMapRestHandler.go
+++ b/api/restHandler/ConfigMapRestHandler.go
@@ -520,7 +520,11 @@ func (handler ConfigMapRestHandlerImpl) CMGlobalDelete(w http.ResponseWriter, r
 		return
 	}
 	name := vars["name"]
-	handler.Logger.Errorw("request payload, CMGlobalDelete", "appId", appId, "id", id, "name", name)
+	if name == "" || len(name) == 0 {
+		// handler.Logger.Errorw("request payload, CMGlobalDelete", "appId", appId, "id", id, "name", name)
+		common.WriteMissingRequiredFieldError(w, "name")
+		return
+	}
 
 	//RBAC START
 	token := r.Header.Get("token")
@@ -574,7 +578,11 @@ func (handler ConfigMapRestHandlerImpl) CMEnvironmentDelete(w http.ResponseWrite
 		return
 	}
 	name := vars["name"]
-	handler.Logger.Errorw("request payload, CMEnvironmentDelete", "appId", appId, "envId", envId, "id", id, "name", name)
+	if name == "" || len(name) == 0 {
+		// handler.Logger.Errorw("request payload, CMGlobalDelete", "appId", appId, "id", id, "name", name)
+		common.WriteMissingRequiredFieldError(w, "name")
+		return
+	}
 
 	//RBAC START
 	token := r.Header.Get("token")
@@ -630,7 +638,11 @@ func (handler ConfigMapRestHandlerImpl) CSGlobalDelete(w http.ResponseWriter, r
 		return
 	}
 	name := vars["name"]
-	handler.Logger.Errorw("request payload, CSGlobalDelete", "appId", appId, "id", id, "name", name)
+	if name == "" || len(name) == 0 {
+		// handler.Logger.Errorw("request payload, CMGlobalDelete", "appId", appId, "id", id, "name", name)
+		common.WriteMissingRequiredFieldError(w, "name")
+		return
+	}
 
 	//RBAC START
 	token := r.Header.Get("token")
@@ -684,7 +696,11 @@ func (handler ConfigMapRestHandlerImpl) CSEnvironmentDelete(w http.ResponseWrite
 		return
 	}
 	name := vars["name"]
-	handler.Logger.Errorw("request payload, CSEnvironmentDelete", "appId", appId, "envId", envId, "id", id, "name", name)
+	if name == "" || len(name) == 0 {
+		// handler.Logger.Errorw("request payload, CMGlobalDelete", "appId", appId, "id", id, "name", name)
+		common.WriteMissingRequiredFieldError(w, "name")
+		return
+	}
 
 	//RBAC START
 	token := r.Header.Get("token")
diff --git a/api/restHandler/app/pipeline/AutoCompleteRestHandler.go b/api/restHandler/app/pipeline/AutoCompleteRestHandler.go
index 7c6e8f7f52..85b3d83327 100644
--- a/api/restHandler/app/pipeline/AutoCompleteRestHandler.go
+++ b/api/restHandler/app/pipeline/AutoCompleteRestHandler.go
@@ -140,10 +140,7 @@ func (handler DevtronAppAutoCompleteRestHandlerImpl) GetAppListForAutocomplete(w
 		if err != nil {
 			// Error already written by ExtractIntPathParamWithContext
 			return
-		}
-		if err != nil {
-			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
-			return
+
 		} else {
 			apps, err = handler.devtronAppConfigService.FindAppsByTeamId(teamIdInt)
 			if err != nil {
diff --git a/pkg/pipeline/ConfigMapService.go b/pkg/pipeline/ConfigMapService.go
index e6d7770a70..942691a957 100644
--- a/pkg/pipeline/ConfigMapService.go
+++ b/pkg/pipeline/ConfigMapService.go
@@ -993,8 +993,10 @@ func (impl ConfigMapServiceImpl) CMGlobalDelete(name string, id int, userId int3
 			return false, err
 		}
 	} else {
-		impl.logger.Debugw("no config map found for delete with this name", "name", name)
-
+		// impl.logger.Debugw("no config map found for delete with this name", "name", name)
+		// this should return false as no config map found
+		impl.logger.Errorw("config map does not exist", "name", name, "id", id)
+		return false, err
 	}
 
 	return true, nil
@@ -1049,7 +1051,10 @@ func (impl ConfigMapServiceImpl) CMEnvironmentDelete(name string, id int, userId
 			return false, err
 		}
 	} else {
-		impl.logger.Debugw("no config map found for delete with this name", "name", name)
+		// impl.logger.Debugw("no config map found for delete with this name", "name", name)
+		// this should return false as no config map found
+		impl.logger.Errorw("config map does not exist", "name", name, "id", id)
+		return false, err
 	}
 	return true, nil
 }
@@ -1103,8 +1108,10 @@ func (impl ConfigMapServiceImpl) CSGlobalDelete(name string, id int, userId int3
 			return false, err
 		}
 	} else {
-		impl.logger.Debugw("no config map found for delete with this name", "name", name)
-
+		// impl.logger.Debugw("no config map found for delete with this name", "name", name)
+		// this should return false as no config map found
+		impl.logger.Errorw("cs does not exist", "name", name, "id", id)
+		return false, err
 	}
 
 	return true, nil
@@ -1158,7 +1165,10 @@ func (impl ConfigMapServiceImpl) CSEnvironmentDelete(name string, id int, userId
 			return false, err
 		}
 	} else {
-		impl.logger.Debugw("no config map found for delete with this name", "name", name)
+		// impl.logger.Debugw("no config map found for delete with this name", "name", name)
+		// this should return false as no config map found
+		impl.logger.Errorw("cs does not exist", "name", name, "id", id)
+		return false, err
 	}
 
 	return true, nil
@@ -1209,8 +1219,10 @@ func (impl ConfigMapServiceImpl) CMGlobalDeleteByAppId(name string, appId int, u
 			return false, err
 		}
 	} else {
-		impl.logger.Debugw("no config map found for delete with this name", "name", name)
-
+		// impl.logger.Debugw("no config map found for delete with this name", "name", name)
+		// this should return false as no config map found
+		impl.logger.Errorw("cnfog map does not exist", "name", name)
+		return false, err
 	}
 
 	return true, nil