diff --git a/bubble-server/src/main/java/bubble/dao/account/AccountDAO.java b/bubble-server/src/main/java/bubble/dao/account/AccountDAO.java
index 768a8d51..2a56ea38 100644
--- a/bubble-server/src/main/java/bubble/dao/account/AccountDAO.java
+++ b/bubble-server/src/main/java/bubble/dao/account/AccountDAO.java
@@ -348,10 +348,15 @@ public class AccountDAO extends AbstractCRUDDAO<Account> implements SqlViewSearc
         log.info("copyTemplates completed: "+acct);
     }
 
+    private final String NETWORK_OWNER_ACCOUNT_UUID_PARAM = "__thisNetworkOwnerAccountUuid__";
+
     @Override public int bulkDeleteWhere(@NonNull final String whereClause,
-                                         @NonNull final Map<String, Object> parameters) {
-        parameters.put("thisNetworkOwnerAccountUuid", configuration.getThisNetwork().getAccount());
-        return super.bulkDeleteWhere("uuid != :thisNetworkOwnerAccountUuid AND (" + whereClause + ")", parameters);
+                                         @Nullable final Map<String, Object> parameters) {
+        final Map<String, Object> enhancedParams = parameters != null ? parameters : new HashMap<>();
+        enhancedParams.put(NETWORK_OWNER_ACCOUNT_UUID_PARAM, configuration.getThisNetwork().getAccount());
+
+        return super.bulkDeleteWhere("uuid != :" + NETWORK_OWNER_ACCOUNT_UUID_PARAM + " AND (" + whereClause + ")",
+                                     enhancedParams);
     }
 
     @Override public void delete(@Nullable final Collection<Account> accounts) {
diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard
index 6ad35ab2..14518c3c 160000
--- a/utils/cobbzilla-wizard
+++ b/utils/cobbzilla-wizard
@@ -1 +1 @@
-Subproject commit 6ad35ab2c21b8887f945b65cb224f99d870ab3ed
+Subproject commit 14518c3c60a455df3542e68949d87dffc9e70ae7