diff --git a/ts/daemon.ts b/ts/daemon.ts
index 2f32e6b..b964e19 100644
--- a/ts/daemon.ts
+++ b/ts/daemon.ts
@@ -72,10 +72,9 @@ export class Daemon {
       await this.monitor();
     } catch (error) {
       this.isRunning = false;
-      logger.error(
-        `Daemon failed to start: ${error instanceof Error ? error.message : String(error)}`,
-      );
-      process.exit(1);
+      const message = error instanceof Error ? error.message : String(error);
+      logger.error(`Daemon failed to start: ${message}`);
+      throw error;
     }
   }
 
diff --git a/ts/modelgrid.ts b/ts/modelgrid.ts
index fc3e26a..c7c9fe8 100644
--- a/ts/modelgrid.ts
+++ b/ts/modelgrid.ts
@@ -256,7 +256,7 @@ export class ModelGrid {
 
     // Initialize containers from config
     for (const containerConfig of this.config.containers) {
-      await this.containerManager.addContainer(containerConfig);
+      this.containerManager.addContainer(containerConfig);
     }
 
     // Initialize model registry