diff --git a/pom.xml b/pom.xml
index dd04fcb7e..5c0fe7458 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-admin</artifactId>
-    <version>5.23.23</version>
+    <version>5.23.24-alpha-174-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/com/uid2/admin/cloudencryption/CloudEncryptionKeyManager.java b/src/main/java/com/uid2/admin/cloudencryption/CloudEncryptionKeyManager.java
index 30aa7eb12..e703e867c 100644
--- a/src/main/java/com/uid2/admin/cloudencryption/CloudEncryptionKeyManager.java
+++ b/src/main/java/com/uid2/admin/cloudencryption/CloudEncryptionKeyManager.java
@@ -72,7 +72,6 @@ public void backfillKeys() throws Exception {
             LOGGER.info("Key backfill complete. Diff: {}", diff);
         } catch (Exception e) {
             LOGGER.error("Key backfill failed", e);
-            throw e;
         }
     }
 
diff --git a/src/main/java/com/uid2/admin/managers/KeysetManager.java b/src/main/java/com/uid2/admin/managers/KeysetManager.java
index 17b035765..587a388e3 100644
--- a/src/main/java/com/uid2/admin/managers/KeysetManager.java
+++ b/src/main/java/com/uid2/admin/managers/KeysetManager.java
@@ -7,12 +7,16 @@
 import com.uid2.shared.auth.ClientKey;
 import com.uid2.shared.auth.Keyset;
 import com.uid2.shared.auth.Role;
+import com.uid2.shared.cloud.CloudStorageException;
 import com.uid2.admin.auth.AdminKeyset;
 import com.uid2.shared.model.ClientType;
 
 import java.time.Instant;
 import java.util.*;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import static java.lang.Math.max;
 
 public class KeysetManager {
@@ -21,6 +25,8 @@ public class KeysetManager {
     private final AdminKeysetWriter keysetStoreWriter;
     private final IKeysetKeyManager keysetKeyManager;
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(KeysetManager.class);
+
     private final boolean enableKeysets;
 
     public KeysetManager(RotatingAdminKeysetStore keysetProvider, AdminKeysetWriter keysetStoreWriter,
@@ -165,6 +171,12 @@ public void createAdminKeysets(Map<Integer, Keyset> keysets) throws  Exception{
             }
         }
 
-        keysetStoreWriter.upload(collection, null);
+        try{
+           keysetStoreWriter.upload(collection, null);
+        }
+        catch (CloudStorageException e) 
+        {
+            LOGGER.error("Failed to create admin keysets", e);
+        }
     }
 }