From e074e55f0ebfbb63d2dd5342424808c037b5db55 Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@microsoft.com>
Date: Fri, 25 Aug 2017 10:59:22 -0700
Subject: [PATCH] PR feedback

---
 Nodejs/Product/Nodejs/NodejsTools.vsct       | 1 +
 Nodejs/Product/ProjectWizard/ImportWizard.cs | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Nodejs/Product/Nodejs/NodejsTools.vsct b/Nodejs/Product/Nodejs/NodejsTools.vsct
index e9e0c5b01..5c6beb2a7 100644
--- a/Nodejs/Product/Nodejs/NodejsTools.vsct
+++ b/Nodejs/Product/Nodejs/NodejsTools.vsct
@@ -210,6 +210,7 @@
         </Strings>
       </Button>
 
+      <!-- This button is invoked by code in the Import Wizard. So it's invisible, but still very much needed. -->
       <Button guid="guidNodeToolsCmdSet" id="cmdidImportWizard" priority="0x010" type="Button">
         <CommandFlag>DefaultInvisible</CommandFlag>
         <Strings>
diff --git a/Nodejs/Product/ProjectWizard/ImportWizard.cs b/Nodejs/Product/ProjectWizard/ImportWizard.cs
index d0d1186e0..50691fa5e 100644
--- a/Nodejs/Product/ProjectWizard/ImportWizard.cs
+++ b/Nodejs/Product/ProjectWizard/ImportWizard.cs
@@ -34,15 +34,14 @@ public void RunStarted(object automationObject, Dictionary<string, string> repla
                 var hr = EnsurePackageLoaded(serviceProvider);
                 if (ErrorHandler.Failed(hr))
                 {
-                    MessageBox.Show(string.Format(ProjectWizardResources.ImportWizardCouldNotStartFailedToLoadPackage, hr), "Visual Studio");
+                    MessageBox.Show(string.Format(ProjectWizardResources.ImportWizardCouldNotStartFailedToLoadPackage, hr), SR.ProductName);
                     throw new WizardBackoutException();
                 }
                 var uiShell = (IVsUIShell)serviceProvider.GetService(typeof(SVsUIShell));
 
-                var projName = replacementsDictionary["$projectname$"];
-                replacementsDictionary.TryGetValue("$specifiedsolutionname$", out var solnName);
                 string directory;
-                if (string.IsNullOrWhiteSpace(solnName))
+                var projName = replacementsDictionary["$projectname$"];
+                if (!replacementsDictionary.TryGetValue("$specifiedsolutionname$", out var solnName) || string.IsNullOrWhiteSpace(solnName))
                 {
                     // Create directory is unchecked, destinationdirectory is the
                     // directory name the user entered plus the project name, we want
@@ -64,7 +63,7 @@ public void RunStarted(object automationObject, Dictionary<string, string> repla
                 hr = uiShell.PostExecCommand(ref guid, (uint)PkgCmdId.cmdidImportWizard, 0, ref inObj);
                 if (ErrorHandler.Failed(hr))
                 {
-                    MessageBox.Show(string.Format(ProjectWizardResources.ImportWizardCouldNotStartUnexpectedError, hr), "Visual Studio");
+                    MessageBox.Show(string.Format(ProjectWizardResources.ImportWizardCouldNotStartUnexpectedError, hr), SR.ProductName);
                 }
             }