From 205900505bb308cbbed69b2a2b1739e5c8c6ebef Mon Sep 17 00:00:00 2001
From: Andy Zhang <xindzhan@microsoft.com>
Date: Wed, 9 Sep 2015 02:26:40 -0700
Subject: [PATCH] Fix storage test for QosEvent writeError

---
 src/Common/Commands.Common/AzurePSCmdlet.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Common/Commands.Common/AzurePSCmdlet.cs b/src/Common/Commands.Common/AzurePSCmdlet.cs
index 43555c5eb5f1..fece0560f2a5 100644
--- a/src/Common/Commands.Common/AzurePSCmdlet.cs
+++ b/src/Common/Commands.Common/AzurePSCmdlet.cs
@@ -407,9 +407,13 @@ protected bool IsVerbose()
         public new void WriteError(ErrorRecord errorRecord)
         {
             FlushDebugMessages();
-            QosEvent.Exception = errorRecord.Exception;
-            QosEvent.IsSuccess = false;
-            LogQosEvent(true);
+            if (QosEvent != null && errorRecord != null)
+            {
+                QosEvent.Exception = errorRecord.Exception;
+                QosEvent.IsSuccess = false;
+                LogQosEvent(true);
+            }
+            
             base.WriteError(errorRecord);
         }