Merge pull request #918 from mjbvz/fix-repl-window-null-deref

Fix Repl window null deref when main NTVS package has not been loaded yet

Author: mjbvz

Common/Product/SharedProject/CommonPackage.cs

@@ -129,6 +129,11 @@ internal void RegisterCommands(IEnumerable<Command> commands, Guid cmdSet) {
         /// </summary>
         /// <returns></returns>
         public static IWpfTextView GetActiveTextView(System.IServiceProvider serviceProvider) {
+            if (serviceProvider == null) {
+                Debug.Assert(false, "No service provider");
+                return null;
+            }
+
             var monitorSelection = (IVsMonitorSelection)serviceProvider.GetService(typeof(SVsShellMonitorSelection));
             if (monitorSelection == null) {
                 return null;
@@ -174,6 +179,10 @@ public static IComponentModel ComponentModel {
         }
 
         internal static CommonProjectNode GetStartupProject(System.IServiceProvider serviceProvider) {
+            if (serviceProvider == null) {
+                Debug.Assert(false, "No service provider");
+                return null;
+            }
             var buildMgr = (IVsSolutionBuildManager)serviceProvider.GetService(typeof(IVsSolutionBuildManager));
             IVsHierarchy hierarchy;
             if (buildMgr != null && ErrorHandler.Succeeded(buildMgr.get_StartupProject(out hierarchy)) && hierarchy != null) {