Small fixes

Author: chadiel

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Components/LongRunningOperationHelper.cs

@@ -83,7 +83,7 @@ internal string WaitOnOperation(OperationResult operationResult)
 
             var trackingResult = this.HandleOperationResponse(operationResult, this.IsResourceCreateOrUpdate ? operationResult.OperationUri : operationResult.LocationUri);
 
-            while (trackingResult.ShouldWait)
+            while (trackingResult != null && trackingResult.ShouldWait)
             {
                 operationResult =
                     this.GetResourcesClient()

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Extensions/ErrorResponseMessageExceptionExtensions.cs

@@ -14,6 +14,7 @@
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions
 {
+    using System;
     using System.Management.Automation;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.ErrorResponses;
 
@@ -31,5 +32,25 @@ internal static ErrorRecord ToErrorRecord(this ErrorResponseMessageException exc
             // TODO: Improve this.
             return new ErrorRecord(exception, exception.ErrorResponseMessage == null ? exception.HttpStatus.ToString() : exception.ErrorResponseMessage.Error.Code, ErrorCategory.CloseError, null);
         }
+
+        /// <summary>
+        /// Converts <see cref="Exception"/> objects into <see cref="ErrorRecord"/>
+        /// </summary>
+        /// <param name="exception">The exception</param>
+        internal static ErrorRecord ToErrorRecord(this Exception exception)
+        {
+            // TODO: Improve this.
+            return new ErrorRecord(exception, exception.Message, ErrorCategory.CloseError, null);
+        }
+
+        /// <summary>
+        /// Converts <see cref="AggregateException"/> objects into <see cref="ErrorRecord"/>
+        /// </summary>
+        /// <param name="exception">The exception</param>
+        internal static ErrorRecord ToErrorRecord(this AggregateException aggregateException)
+        {
+            // TODO: Improve this.
+            return new ErrorRecord(aggregateException, aggregateException.ToString(), ErrorCategory.CloseError, null);
+        }
     }
 }

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Extensions/JsonExtensions.cs

@@ -155,10 +155,16 @@ public static bool CanConvertTo<TType>(this JToken jobject)
         /// <param name="result">The result.</param>
         public static bool TryConvertTo<TType>(this string str, out TType result)
         {
-            JToken tmp = null;
+            if (string.IsNullOrWhiteSpace(str))
+            {
+                result = default(TType);
+                return true;
+            }
+
             try
             {
-                tmp = str.ToJToken();
+                result = str.FromJson<TType>();
+                return !object.Equals(result, default(TType));
             }
             catch (FormatException)
             {
@@ -170,7 +176,8 @@ public static bool TryConvertTo<TType>(this string str, out TType result)
             {
             }
 
-            return tmp.TryConvertTo<TType>(out result);
+            result = default(TType);
+            return false;
         }
 
         /// <summary>

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/ResourceManagerCmdletBase.cs

@@ -344,10 +344,12 @@ private void HandleException(ExceptionDispatchInfo capturedException)
                         {
                             this.ThrowTerminatingError(errorResponseException.ToErrorRecord());
                         }
+
+                        this.ThrowTerminatingError(aggregateException.InnerExceptions.Single().ToErrorRecord());
                     }
                     else
                     {
-                        throw aggregateException.Flatten();
+                        this.ThrowTerminatingError(aggregateException.ToErrorRecord());
                     }
                 }