diff --git a/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx b/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx
index ed2f0f9f8d..fe91f067d6 100644
--- a/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx
+++ b/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx
@@ -31,7 +31,7 @@ const container = css`
 const idsInTab: Record<PivotItemKey, string[]> = {
   Basics: ['runtimeSettings'],
   LuisQna: ['luisKey', 'qnaKey'],
-  Connections: ['connections'],
+  Connections: ['connections', 'addNewPublishProfile'],
   SkillConfig: [],
   Language: [],
 };
diff --git a/Composer/packages/lib/shared/src/constant.ts b/Composer/packages/lib/shared/src/constant.ts
index 042da5fb0f..75a8bae49b 100644
--- a/Composer/packages/lib/shared/src/constant.ts
+++ b/Composer/packages/lib/shared/src/constant.ts
@@ -3,7 +3,7 @@
 
 export const QnABotTemplateId = 'QnASample';
 
-export const emptyBotNpmTemplateName = '@microsoft/generator-microsoft-bot-empty';
+export const emptyBotNpmTemplateName = '@microsoft/generator-bot-empty';
 
 export const SensitiveProperties = [
   'MicrosoftAppPassword',
diff --git a/Composer/packages/server-workers/src/workers/templateInstallation.worker.ts b/Composer/packages/server-workers/src/workers/templateInstallation.worker.ts
index 6ad7aa5654..cb4c3b1006 100644
--- a/Composer/packages/server-workers/src/workers/templateInstallation.worker.ts
+++ b/Composer/packages/server-workers/src/workers/templateInstallation.worker.ts
@@ -20,12 +20,9 @@ const installRemoteTemplate = async (
     log('Installing generator', npmPackageName);
     templateVersion = templateVersion ? templateVersion : '*';
     await yeomanEnv.installLocalGenerators({ [npmPackageName]: templateVersion });
-
-    // log('Looking up local packages');
-    // await yeomanEnv.lookupLocalPackages();
-    return true;
-  } catch {
-    return false;
+  } catch (err) {
+    log('Template failed to install', npmPackageName, templateVersion, templateGeneratorPath);
+    throw err;
   }
 };
 
@@ -75,21 +72,11 @@ const yeomanWork = async (
   log('Installing Yeoman template');
   parentPort?.postMessage({ status: 'Installing Yeoman template' });
 
-  const remoteTemplateAvailable = await installRemoteTemplate(
-    yeomanEnv,
-    templateGeneratorPath,
-    npmPackageName,
-    templateVersion
-  );
-  if (remoteTemplateAvailable) {
-    log('Instantiating Yeoman template');
-    parentPort?.postMessage({ status: 'Instantiating Yeoman template' });
+  await installRemoteTemplate(yeomanEnv, templateGeneratorPath, npmPackageName, templateVersion);
+  log('Instantiating Yeoman template');
+  parentPort?.postMessage({ status: 'Instantiating Yeoman template' });
 
-    await instantiateRemoteTemplate(yeomanEnv, generatorName, dstDir, projectName, runtimeType, runtimeLanguage);
-  } else {
-    // handle error
-    throw new Error(`error hit when installing remote template`);
-  }
+  await instantiateRemoteTemplate(yeomanEnv, generatorName, dstDir, projectName, runtimeType, runtimeLanguage);
 };
 
 export type TemplateInstallationArgs = {