diff --git a/java/net/i2p/router/MacLauncher.java b/java/net/i2p/router/MacLauncher.java
index b53a95f..cd16369 100644
--- a/java/net/i2p/router/MacLauncher.java
+++ b/java/net/i2p/router/MacLauncher.java
@@ -60,8 +60,13 @@ public class MacLauncher {
             sleep(1000);
         }
 
+        // then wait for ClientAppManager
+        ClientAppManager cam;
+        while ((cam = ctx.clientAppManager()) == null) {
+            sleep(1000);
+        }
+
         // then wait for the update manager
-        ClientAppManager cam = ctx.clientAppManager();
         UpdateManager um;
         while ((um = (UpdateManager) cam.getRegisteredApp(UpdateManager.APP_NAME)) == null) {
             sleep(1000);