diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index ae86023e978..2f2b5ab10c8 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -4012,7 +4012,8 @@ public class ManagementServerImpl implements ManagementServer {
         
         _templateDao.update(template.getId(), updatedTemplate);
 
-        Long domainId = account.getDomainId();
+        Long domainId;
+        domainId =  (null == account) ?  DomainVO.ROOT_DOMAIN : account.getDomainId(); // Account == null for 8096 and so its safe for domainid = ROOT
         if ("add".equalsIgnoreCase(operation)) {
             txn.start();
             for (String accountName : accountNames) {