RANGER-2660-addendum patch
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java b/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
index 974fc18..71511dc 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
@@ -63,6 +63,7 @@
 import org.apache.ranger.plugin.model.RangerService;
 import org.apache.ranger.plugin.store.EmbeddedServiceDefsUtil;
 import org.apache.ranger.rest.ServiceREST;
+import org.apache.ranger.security.context.RangerAdminOpContext;
 import org.apache.ranger.security.context.RangerContextHolder;
 import org.apache.ranger.view.VXPortalUser;
 import org.apache.ranger.view.VXResource;
@@ -1495,7 +1496,14 @@
 	}
 
 	public static boolean setBulkMode(boolean val) {
-		RangerContextHolder.getOpContext().setBulkModeContext(val);
+		if(RangerContextHolder.getOpContext()!=null){
+			RangerContextHolder.getOpContext().setBulkModeContext(val);
+		}
+		else {
+			  RangerAdminOpContext opContext = new RangerAdminOpContext();
+			  opContext.setBulkModeContext(val);
+			  RangerContextHolder.setOpContext(opContext);
+		}
 		return isBulkMode();
 	}