diff --git a/packages/backend/server/utils/markdown.ts b/packages/backend/server/utils/markdown.ts
index 8db25b7c..49eefc6e 100644
--- a/packages/backend/server/utils/markdown.ts
+++ b/packages/backend/server/utils/markdown.ts
@@ -93,7 +93,7 @@ function generateTemplatesStr(templates: Record<string, string>) {
   const entries = Object.entries(templates).filter(([k]) => k !== "default");
   let str = `[Open in Stackblitz](${templates["default"]})`;
 
-  if (entries.length <= 2) {
+  if (entries.length && entries.length <= 2) {
     str += ` • ${entries.map(([k, v]) => `[${k}](${v})`).join(" • ")}`;
   } else if (entries.length > 2) {
     str += createCollapsibleBlock(
diff --git a/packages/cli/index.ts b/packages/cli/index.ts
index ba477ec2..e216deb4 100644
--- a/packages/cli/index.ts
+++ b/packages/cli/index.ts
@@ -331,7 +331,7 @@ const main = defineCommand({
   },
 });
 
-runMain(main);
+runMain(main).then(() => process.exit(0)).catch(() => process.exit(1));
 
 // TODO: we'll add support for yarn if users hit issues with npm
 async function resolveTarball(pm: "npm" | "pnpm", p: string) {