diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchForHBaseServiceDefUpdate_J10035.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchForHBaseServiceDefUpdate_J10035.java
index 75fa78ad9f..ecda77a4e2 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/PatchForHBaseServiceDefUpdate_J10035.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchForHBaseServiceDefUpdate_J10035.java
@@ -137,8 +137,8 @@ private boolean updateHBaseServiceDef() throws Exception {
                 jsonPreUpdate = xXServiceDefObj.getDefOptions();
                 serviceDefOptionsPreUpdate = jsonStringToMap(jsonPreUpdate);
             } else {
-                logger.error("HBase service-definition does not exist in the Ranger DAO.");
-                return false;
+                logger.error("HBase service-definition does not exist in the Ranger DAO. No patching is needed!!");
+                return true;
             }
             dbHBaseServiceDef = svcDBStore.getServiceDefByName(SERVICEDBSTORE_SERVICEDEFBYNAME_HBASE_NAME);
 
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchForHiveServiceDefUpdate_J10027.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchForHiveServiceDefUpdate_J10027.java
index fa319bdb88..24cf14fa18 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/PatchForHiveServiceDefUpdate_J10027.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchForHiveServiceDefUpdate_J10027.java
@@ -137,8 +137,8 @@ private boolean updateHiveServiceDef() throws Exception {
 				jsonPreUpdate = xXServiceDefObj.getDefOptions();
 				serviceDefOptionsPreUpdate = jsonStringToMap(jsonPreUpdate);
 			} else {
-				logger.error("Hive service-definition does not exist in the Ranger DAO.");
-				return false;
+				logger.error("Hive service-definition does not exist in the Ranger DAO. No patching is needed!!");
+				return true;
 			}
 			dbHiveServiceDef = svcDBStore.getServiceDefByName(SERVICEDBSTORE_SERVICEDEFBYNAME_HIVE_NAME);
 
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchForMigratingOldRegimePolicyJson_J10046.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchForMigratingOldRegimePolicyJson_J10046.java
index dbffc56634..4dfe72aed3 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/PatchForMigratingOldRegimePolicyJson_J10046.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchForMigratingOldRegimePolicyJson_J10046.java
@@ -291,9 +291,10 @@ private void addResourceDefRef(String serviceType, RangerPolicy policy) throws E
 			resourceNameIdMap.put(serviceType, serviceDefResourceNameIDMap);
 
 			XXServiceDef dbServiceDef = daoMgr.getXXServiceDef().findByName(serviceType);
-
-			for (XXResourceDef resourceDef : daoMgr.getXXResourceDef().findByServiceDefId(dbServiceDef.getId())) {
-				serviceDefResourceNameIDMap.put(resourceDef.getName(), resourceDef.getId());
+			if (dbServiceDef != null) {
+				for (XXResourceDef resourceDef : daoMgr.getXXResourceDef().findByServiceDefId(dbServiceDef.getId())) {
+					serviceDefResourceNameIDMap.put(resourceDef.getName(), resourceDef.getId());
+				}
 			}
 		}
 
@@ -423,9 +424,10 @@ private void addAccessDefRef(String serviceType, Long policyId, Set<String> acce
 			accessTypeIdMap.put(serviceType, serviceDefAccessTypeIDMap);
 
 			XXServiceDef dbServiceDef = daoMgr.getXXServiceDef().findByName(serviceType);
-
-			for (XXAccessTypeDef accessTypeDef : daoMgr.getXXAccessTypeDef().findByServiceDefId(dbServiceDef.getId())) {
-				serviceDefAccessTypeIDMap.put(accessTypeDef.getName(), accessTypeDef.getId());
+			if (dbServiceDef != null) {
+				for (XXAccessTypeDef accessTypeDef : daoMgr.getXXAccessTypeDef().findByServiceDefId(dbServiceDef.getId())) {
+					serviceDefAccessTypeIDMap.put(accessTypeDef.getName(), accessTypeDef.getId());
+				}
 			}
 		}
 
@@ -462,9 +464,10 @@ private void addPolicyConditionDefRef(String serviceType, Long policyId, Set<Str
 			conditionNameIdMap.put(serviceType, serviceDefConditionNameIDMap);
 
 			XXServiceDef dbServiceDef = daoMgr.getXXServiceDef().findByName(serviceType);
-
-			for (XXPolicyConditionDef conditionDef : daoMgr.getXXPolicyConditionDef().findByServiceDefId(dbServiceDef.getId())) {
-				serviceDefConditionNameIDMap.put(conditionDef.getName(), conditionDef.getId());
+			if (dbServiceDef != null) {
+				for (XXPolicyConditionDef conditionDef : daoMgr.getXXPolicyConditionDef().findByServiceDefId(dbServiceDef.getId())) {
+					serviceDefConditionNameIDMap.put(conditionDef.getName(), conditionDef.getId());
+				}
 			}
 		}
 
@@ -502,9 +505,10 @@ private void addDataMaskDefRef(String serviceType, Long policyId, Set<String> da
 			dataMaskTypeIdMap.put(serviceType, serviceDefDataMaskTypeIDMap);
 
 			XXServiceDef dbServiceDef = daoMgr.getXXServiceDef().findByName(serviceType);
-
-			for (XXDataMaskTypeDef dataMaskTypeDef : daoMgr.getXXDataMaskTypeDef().findByServiceDefId(dbServiceDef.getId())) {
-				serviceDefDataMaskTypeIDMap.put(dataMaskTypeDef.getName(), dataMaskTypeDef.getId());
+			if (dbServiceDef != null) {
+				for (XXDataMaskTypeDef dataMaskTypeDef : daoMgr.getXXDataMaskTypeDef().findByServiceDefId(dbServiceDef.getId())) {
+					serviceDefDataMaskTypeIDMap.put(dataMaskTypeDef.getName(), dataMaskTypeDef.getId());
+				}
 			}
 		}
 
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefConfigUpdate_J10051.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefConfigUpdate_J10051.java
index 8d3cfd3de9..3f08bc7617 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefConfigUpdate_J10051.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefConfigUpdate_J10051.java
@@ -132,8 +132,8 @@ private boolean updateOzoneServiceDef() throws Exception {
 				jsonPreUpdate = xXServiceDefObj.getDefOptions();
 				serviceDefOptionsPreUpdate = jsonStringToMap(jsonPreUpdate);
 			} else {
-				logger.error("Ozone service-definition does not exist in the Ranger DAO.");
-				return false;
+				logger.error("Ozone service-definition does not exist in the Ranger DAO. No patching is needed!!");
+				return true;
 			}
 			dbOzoneServiceDef = svcDBStore.getServiceDefByName(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_OZONE_NAME);
 
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefUpdate_J10041.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefUpdate_J10041.java
index 538093a983..0a085f659a 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefUpdate_J10041.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefUpdate_J10041.java
@@ -147,8 +147,8 @@ private boolean updateOzoneServiceDef() throws Exception {
 				jsonPreUpdate = xXServiceDefObj.getDefOptions();
 				serviceDefOptionsPreUpdate = jsonStringToMap(jsonPreUpdate);
 			} else {
-				logger.error("Ozone service-definition does not exist in the Ranger DAO.");
-				return false;
+				logger.error("Ozone service-definition does not exist in the Ranger DAO. No patching is needed!!");
+				return true;
 			}
 			dbOzoneServiceDef = svcDBStore.getServiceDefByName(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_OZONE_NAME);
 
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchForTagServiceDefUpdate_J10028.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchForTagServiceDefUpdate_J10028.java
index 785e871f27..072831bf8f 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/PatchForTagServiceDefUpdate_J10028.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchForTagServiceDefUpdate_J10028.java
@@ -136,8 +136,8 @@ private boolean updateTagServiceDef() throws Exception {
 				jsonPreUpdate = xXServiceDefObj.getDefOptions();
 				serviceDefOptionsPreUpdate = jsonStringToMap(jsonPreUpdate);
 			} else {
-				logger.error("Tag service-definition does not exist in the Ranger DAO.");
-				return false;
+				logger.error("Tag service-definition does not exist in the Ranger DAO. No patching is needed");
+				return true;
 			}
 			dbTagServiceDef = svcDBStore.getServiceDefByName(SERVICEDBSTORE_SERVICEDEFBYNAME_TAG_NAME);
 
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchForUpdatingPolicyJson_J10019.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchForUpdatingPolicyJson_J10019.java
index 9b99b942c8..e7d10883d7 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/PatchForUpdatingPolicyJson_J10019.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchForUpdatingPolicyJson_J10019.java
@@ -314,9 +314,10 @@ private void addResourceDefRef(String serviceType, RangerPolicy policy) throws E
 			resourceNameIdMap.put(serviceType, serviceDefResourceNameIDMap);
 
 			XXServiceDef dbServiceDef = daoMgr.getXXServiceDef().findByName(serviceType);
-
-			for (XXResourceDef resourceDef : daoMgr.getXXResourceDef().findByServiceDefId(dbServiceDef.getId())) {
-				serviceDefResourceNameIDMap.put(resourceDef.getName(), resourceDef.getId());
+			if (dbServiceDef != null) {
+				for (XXResourceDef resourceDef : daoMgr.getXXResourceDef().findByServiceDefId(dbServiceDef.getId())) {
+					serviceDefResourceNameIDMap.put(resourceDef.getName(), resourceDef.getId());
+				}
 			}
 		}
 
@@ -446,9 +447,10 @@ private void addAccessDefRef(String serviceType, Long policyId, Set<String> acce
 			accessTypeIdMap.put(serviceType, serviceDefAccessTypeIDMap);
 
 			XXServiceDef dbServiceDef = daoMgr.getXXServiceDef().findByName(serviceType);
-
-			for (XXAccessTypeDef accessTypeDef : daoMgr.getXXAccessTypeDef().findByServiceDefId(dbServiceDef.getId())) {
-				serviceDefAccessTypeIDMap.put(accessTypeDef.getName(), accessTypeDef.getId());
+			if (dbServiceDef != null) {
+				for (XXAccessTypeDef accessTypeDef : daoMgr.getXXAccessTypeDef().findByServiceDefId(dbServiceDef.getId())) {
+					serviceDefAccessTypeIDMap.put(accessTypeDef.getName(), accessTypeDef.getId());
+				}
 			}
 		}
 
@@ -485,9 +487,10 @@ private void addPolicyConditionDefRef(String serviceType, Long policyId, Set<Str
 			conditionNameIdMap.put(serviceType, serviceDefConditionNameIDMap);
 
 			XXServiceDef dbServiceDef = daoMgr.getXXServiceDef().findByName(serviceType);
-
-			for (XXPolicyConditionDef conditionDef : daoMgr.getXXPolicyConditionDef().findByServiceDefId(dbServiceDef.getId())) {
-				serviceDefConditionNameIDMap.put(conditionDef.getName(), conditionDef.getId());
+			if (dbServiceDef != null) {
+				for (XXPolicyConditionDef conditionDef : daoMgr.getXXPolicyConditionDef().findByServiceDefId(dbServiceDef.getId())) {
+					serviceDefConditionNameIDMap.put(conditionDef.getName(), conditionDef.getId());
+				}
 			}
 		}
 
@@ -525,9 +528,10 @@ private void addDataMaskDefRef(String serviceType, Long policyId, Set<String> da
 			dataMaskTypeIdMap.put(serviceType, serviceDefDataMaskTypeIDMap);
 
 			XXServiceDef dbServiceDef = daoMgr.getXXServiceDef().findByName(serviceType);
-
-			for (XXDataMaskTypeDef dataMaskTypeDef : daoMgr.getXXDataMaskTypeDef().findByServiceDefId(dbServiceDef.getId())) {
-				serviceDefDataMaskTypeIDMap.put(dataMaskTypeDef.getName(), dataMaskTypeDef.getId());
+			if (dbServiceDef != null) {
+				for (XXDataMaskTypeDef dataMaskTypeDef : daoMgr.getXXDataMaskTypeDef().findByServiceDefId(dbServiceDef.getId())) {
+					serviceDefDataMaskTypeIDMap.put(dataMaskTypeDef.getName(), dataMaskTypeDef.getId());
+				}
 			}
 		}