From 17127a993b4c1170e4ee0317aa91b1f1d3c9da00 Mon Sep 17 00:00:00 2001
From: Tien Nguyen <tihoanh@microsoft.com>
Date: Wed, 2 Sep 2015 15:55:50 -0700
Subject: [PATCH] Add null check for NodejsPackage.Instance.

---
 Nodejs/Product/Nodejs/Logging/LiveLogger.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Nodejs/Product/Nodejs/Logging/LiveLogger.cs b/Nodejs/Product/Nodejs/Logging/LiveLogger.cs
index 3eb9c185b..0ab6951f5 100644
--- a/Nodejs/Product/Nodejs/Logging/LiveLogger.cs
+++ b/Nodejs/Product/Nodejs/Logging/LiveLogger.cs
@@ -32,10 +32,12 @@ internal sealed class LiveLogger {
         private static volatile LiveLogger _instance;
         private static object _loggerLock = new object();
 
-        private NodejsDiagnosticsOptionsPage _diagnosticsOptions;
+        private NodejsDiagnosticsOptionsPage _diagnosticsOptions = null;
 
         private LiveLogger() {
-            _diagnosticsOptions = NodejsPackage.Instance.DiagnosticsOptionsPage;
+            if (NodejsPackage.Instance != null) {
+                _diagnosticsOptions = NodejsPackage.Instance.DiagnosticsOptionsPage;
+            }
         }
 
         private static LiveLogger Instance {
@@ -68,7 +70,7 @@ public static void WriteLine(string format, params object[] args) {
         private void LogMessage(string message) {
             Debug.WriteLine(message);
 
-            if (_diagnosticsOptions.IsLiveDiagnosticsEnabled) {
+            if (_diagnosticsOptions != null && _diagnosticsOptions.IsLiveDiagnosticsEnabled) {
                 var pane = OutputWindowRedirector.Get(VisualStudio.Shell.ServiceProvider.GlobalProvider, LiveDiagnosticLogPaneGuid, LiveDiagnosticLogPaneName);
                 if (pane != null) {
                     pane.WriteLine(message);