diff --git a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/site/SitePushHandler.java b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/site/SitePushHandler.java
index 30f24fe9e592..87a79fb9aefe 100644
--- a/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/site/SitePushHandler.java
+++ b/tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/site/SitePushHandler.java
@@ -293,11 +293,12 @@ private SiteView verifyAndReturnSiteAfterCompletion(final String operation,
             final String siteName, final boolean isSiteLive,
             final boolean isArchived) {
 
-        final var siteViewResponse = verifyAndReturnSiteAfterCompletion(
+        var siteViewFuture = verifyAndReturnSiteAfterCompletion(
                 siteName,
                 isSiteLive,
                 isArchived
-        ).join();
+        );
+        final var siteViewResponse = siteViewFuture.exceptionally(ex -> null).join();
 
         if (siteViewResponse == null) {
             logger.error(
@@ -334,7 +335,7 @@ private CompletableFuture<SiteView> verifyAndReturnSiteAfterCompletion(
         Runnable task = new Runnable() {
 
             final long start = System.currentTimeMillis();
-            final long end = start + 15 * 1000;
+            final long end = start + (15 * 1000);
 
             @Override
             public void run() {