diff --git a/bubble-server/src/main/java/bubble/service/boot/PublicUpgradeMonitorService.java b/bubble-server/src/main/java/bubble/service/boot/PublicUpgradeMonitorService.java
index 2d73008b..9bbd03ca 100644
--- a/bubble-server/src/main/java/bubble/service/boot/PublicUpgradeMonitorService.java
+++ b/bubble-server/src/main/java/bubble/service/boot/PublicUpgradeMonitorService.java
@@ -16,8 +16,7 @@ import java.io.File;
 
 import static java.util.concurrent.TimeUnit.HOURS;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.cobbzilla.util.daemon.ZillaRuntime.die;
-import static org.cobbzilla.util.daemon.ZillaRuntime.shortError;
+import static org.cobbzilla.util.daemon.ZillaRuntime.*;
 import static org.cobbzilla.util.http.HttpUtil.url2file;
 import static org.cobbzilla.util.http.HttpUtil.url2string;
 import static org.cobbzilla.util.io.FileUtil.abs;
@@ -51,8 +50,9 @@ public class PublicUpgradeMonitorService extends JarUpgradeMonitor {
             // only update our sage version if the new public version is both
             // -- newer than ourselves
             // -- newer than the current sageVersion (or the current sageVersion is null)
-            if (isNewerVersion(fullVersion, currentVersion)
-                    && (configuration.getSageVersion() == null || isNewerVersion(fullVersion, configuration.getSageVersion().getVersion()))) {
+            final BubbleVersionInfo currentSageVersion = configuration.getSageVersion();
+            if (isNewerVersion(currentVersion, fullVersion)
+                    && (currentSageVersion == null || empty(currentSageVersion.getVersion()) || isNewerVersion(currentSageVersion.getVersion(), fullVersion))) {
                 log.info("process: latest version ("+fullVersion+") is newer than current version ("+currentVersion+"), setting configuration.sageVersion");
                 final String shortVersion = fullVersion.substring(fullVersion.indexOf(" ") + 1);
                 final String shaUrl = RELEASE_SHA_URL.replace(VERSION_TOKEN, rawVersion);
diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard
index 696dd95a..4bd7d4c2 160000
--- a/utils/cobbzilla-wizard
+++ b/utils/cobbzilla-wizard
@@ -1 +1 @@
-Subproject commit 696dd95a70d0040e8635720562805dd727f4c238
+Subproject commit 4bd7d4c2abbe3c47d76a2ba2f4e4fc07f0a8a3ce