commit 10

Author: philasmar

Libraries/src/Amazon.Lambda.RuntimeSupport/Helpers/ConsoleLoggerWriter.cs

@@ -227,6 +227,7 @@ public LogLevelLoggerWriter(IEnvironmentVariables environmentVariables)
         /// <param name="stdErrorWriter"></param>
         public LogLevelLoggerWriter(TextWriter stdOutWriter, TextWriter stdErrorWriter)
         {
+            _environmentVariables = new SystemEnvironmentVariables();
             Initialize(stdOutWriter, stdErrorWriter);
         }
 
@@ -325,15 +326,15 @@ public IRuntimeApiHeaders CurrentRuntimeApiHeaders
             {
                 get
                 {
-                    if (Utils.IsUsingMultiConcurrency(_environmentVariables))
+                    if (_currentRuntimeApiHeadersStorage != null && Utils.IsUsingMultiConcurrency(_environmentVariables))
                     {
                         return _currentRuntimeApiHeadersStorage.Value;
                     }
                     return _currentRuntimeApiHeaders;
                 }
                 set
                 {
-                    if (Utils.IsUsingMultiConcurrency(_environmentVariables))
+                    if (_currentRuntimeApiHeadersStorage != null && Utils.IsUsingMultiConcurrency(_environmentVariables))
                     {
                         _currentRuntimeApiHeadersStorage.Value = value;
                     }