diff --git a/src/SDKs/Automation/Management.Automation/Generated/ISoftwareUpdateConfigurationMachineRunsOperations.cs b/src/SDKs/Automation/Management.Automation/Generated/ISoftwareUpdateConfigurationMachineRunsOperations.cs
index c79a86490f81..2368969ffe0c 100644
--- a/src/SDKs/Automation/Management.Automation/Generated/ISoftwareUpdateConfigurationMachineRunsOperations.cs
+++ b/src/SDKs/Automation/Management.Automation/Generated/ISoftwareUpdateConfigurationMachineRunsOperations.cs
@@ -45,7 +45,7 @@ public partial interface ISoftwareUpdateConfigurationMachineRunsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="ErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -86,7 +86,7 @@ public partial interface ISoftwareUpdateConfigurationMachineRunsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="ErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
diff --git a/src/SDKs/Automation/Management.Automation/Generated/ISoftwareUpdateConfigurationRunsOperations.cs b/src/SDKs/Automation/Management.Automation/Generated/ISoftwareUpdateConfigurationRunsOperations.cs
index f7414fe6f18a..f86f88c25f2b 100644
--- a/src/SDKs/Automation/Management.Automation/Generated/ISoftwareUpdateConfigurationRunsOperations.cs
+++ b/src/SDKs/Automation/Management.Automation/Generated/ISoftwareUpdateConfigurationRunsOperations.cs
@@ -45,7 +45,7 @@ public partial interface ISoftwareUpdateConfigurationRunsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="ErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -86,7 +86,7 @@ public partial interface ISoftwareUpdateConfigurationRunsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="ErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
diff --git a/src/SDKs/Automation/Management.Automation/Generated/ISoftwareUpdateConfigurationsOperations.cs b/src/SDKs/Automation/Management.Automation/Generated/ISoftwareUpdateConfigurationsOperations.cs
index 3a6ceb2915bb..5d82085c11f9 100644
--- a/src/SDKs/Automation/Management.Automation/Generated/ISoftwareUpdateConfigurationsOperations.cs
+++ b/src/SDKs/Automation/Management.Automation/Generated/ISoftwareUpdateConfigurationsOperations.cs
@@ -49,7 +49,7 @@ public partial interface ISoftwareUpdateConfigurationsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="ErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -81,7 +81,7 @@ public partial interface ISoftwareUpdateConfigurationsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="ErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -113,7 +113,7 @@ public partial interface ISoftwareUpdateConfigurationsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="ErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -142,7 +142,7 @@ public partial interface ISoftwareUpdateConfigurationsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="ErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
diff --git a/src/SDKs/Automation/Management.Automation/Generated/Models/DscNodeConfigurationCreateOrUpdateParameters.cs b/src/SDKs/Automation/Management.Automation/Generated/Models/DscNodeConfigurationCreateOrUpdateParameters.cs
index 74c357b018f0..3b34ee6827c8 100644
--- a/src/SDKs/Automation/Management.Automation/Generated/Models/DscNodeConfigurationCreateOrUpdateParameters.cs
+++ b/src/SDKs/Automation/Management.Automation/Generated/Models/DscNodeConfigurationCreateOrUpdateParameters.cs
@@ -38,29 +38,19 @@ public DscNodeConfigurationCreateOrUpdateParameters()
         /// DscNodeConfigurationCreateOrUpdateParameters class.
         /// </summary>
         /// <param name="source">Gets or sets the source.</param>
-        /// <param name="name">Name of the node configuration.</param>
         /// <param name="configuration">Gets or sets the configuration of the
         /// node.</param>
-        /// <param name="source1">Gets or sets the source.</param>
-        /// <param name="name1">Gets or sets the type of the parameter.</param>
-        /// <param name="configuration1">Gets or sets the configuration of the
-        /// node.</param>
-        /// <param name="newNodeConfigurationBuildVersionRequired">If a new
-        /// build version of NodeConfiguration is required.</param>
         /// <param name="incrementNodeConfigurationBuild">If a new build
         /// version of NodeConfiguration is required.</param>
+        /// <param name="name">Name of the node configuration.</param>
         /// <param name="tags">Gets or sets the tags attached to the
         /// resource.</param>
-        public DscNodeConfigurationCreateOrUpdateParameters(ContentSource source, string name, DscConfigurationAssociationProperty configuration, ContentSource source1, string name1, DscConfigurationAssociationProperty configuration1, bool? newNodeConfigurationBuildVersionRequired = default(bool?), bool? incrementNodeConfigurationBuild = default(bool?), IDictionary<string, string> tags = default(IDictionary<string, string>))
+        public DscNodeConfigurationCreateOrUpdateParameters(ContentSource source, DscConfigurationAssociationProperty configuration, bool? incrementNodeConfigurationBuild = default(bool?), string name = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>))
         {
             Source = source;
-            Name = name;
             Configuration = configuration;
-            NewNodeConfigurationBuildVersionRequired = newNodeConfigurationBuildVersionRequired;
-            Source1 = source1;
-            Name1 = name1;
-            Configuration1 = configuration1;
             IncrementNodeConfigurationBuild = incrementNodeConfigurationBuild;
+            Name = name;
             Tags = tags;
             CustomInit();
         }
@@ -73,52 +63,27 @@ public DscNodeConfigurationCreateOrUpdateParameters()
         /// <summary>
         /// Gets or sets the source.
         /// </summary>
-        [JsonProperty(PropertyName = "source")]
+        [JsonProperty(PropertyName = "properties.source")]
         public ContentSource Source { get; set; }
 
-        /// <summary>
-        /// Gets or sets name of the node configuration.
-        /// </summary>
-        [JsonProperty(PropertyName = "name")]
-        public string Name { get; set; }
-
         /// <summary>
         /// Gets or sets the configuration of the node.
         /// </summary>
-        [JsonProperty(PropertyName = "configuration")]
+        [JsonProperty(PropertyName = "properties.configuration")]
         public DscConfigurationAssociationProperty Configuration { get; set; }
 
         /// <summary>
         /// Gets or sets if a new build version of NodeConfiguration is
         /// required.
         /// </summary>
-        [JsonProperty(PropertyName = "newNodeConfigurationBuildVersionRequired")]
-        public bool? NewNodeConfigurationBuildVersionRequired { get; set; }
-
-        /// <summary>
-        /// Gets or sets the source.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.source")]
-        public ContentSource Source1 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the type of the parameter.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.name")]
-        public string Name1 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the configuration of the node.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.configuration")]
-        public DscConfigurationAssociationProperty Configuration1 { get; set; }
+        [JsonProperty(PropertyName = "properties.incrementNodeConfigurationBuild")]
+        public bool? IncrementNodeConfigurationBuild { get; set; }
 
         /// <summary>
-        /// Gets or sets if a new build version of NodeConfiguration is
-        /// required.
+        /// Gets or sets name of the node configuration.
         /// </summary>
-        [JsonProperty(PropertyName = "properties.incrementNodeConfigurationBuild")]
-        public bool? IncrementNodeConfigurationBuild { get; set; }
+        [JsonProperty(PropertyName = "name")]
+        public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the tags attached to the resource.
@@ -138,34 +103,14 @@ public virtual void Validate()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "Source");
             }
-            if (Name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "Name");
-            }
             if (Configuration == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "Configuration");
             }
-            if (Source1 == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "Source1");
-            }
-            if (Name1 == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "Name1");
-            }
-            if (Configuration1 == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "Configuration1");
-            }
             if (Source != null)
             {
                 Source.Validate();
             }
-            if (Source1 != null)
-            {
-                Source1.Validate();
-            }
         }
     }
 }
diff --git a/src/SDKs/Automation/Management.Automation/Generated/SoftwareUpdateConfigurationMachineRunsOperations.cs b/src/SDKs/Automation/Management.Automation/Generated/SoftwareUpdateConfigurationMachineRunsOperations.cs
index e782cb92fc3e..a8847057d06e 100644
--- a/src/SDKs/Automation/Management.Automation/Generated/SoftwareUpdateConfigurationMachineRunsOperations.cs
+++ b/src/SDKs/Automation/Management.Automation/Generated/SoftwareUpdateConfigurationMachineRunsOperations.cs
@@ -72,7 +72,7 @@ internal SoftwareUpdateConfigurationMachineRunsOperations(AutomationClient clien
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="ErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -212,14 +212,13 @@ internal SoftwareUpdateConfigurationMachineRunsOperations(AutomationClient clien
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -229,10 +228,6 @@ internal SoftwareUpdateConfigurationMachineRunsOperations(AutomationClient clien
                 }
                 ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
                 ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
                 if (_shouldTrace)
                 {
                     ServiceClientTracing.Error(_invocationId, ex);
@@ -307,7 +302,7 @@ internal SoftwareUpdateConfigurationMachineRunsOperations(AutomationClient clien
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="ErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -460,14 +455,13 @@ internal SoftwareUpdateConfigurationMachineRunsOperations(AutomationClient clien
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -477,10 +471,6 @@ internal SoftwareUpdateConfigurationMachineRunsOperations(AutomationClient clien
                 }
                 ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
                 ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
                 if (_shouldTrace)
                 {
                     ServiceClientTracing.Error(_invocationId, ex);
diff --git a/src/SDKs/Automation/Management.Automation/Generated/SoftwareUpdateConfigurationRunsOperations.cs b/src/SDKs/Automation/Management.Automation/Generated/SoftwareUpdateConfigurationRunsOperations.cs
index 06c8f1214ab2..6a182cab2dc2 100644
--- a/src/SDKs/Automation/Management.Automation/Generated/SoftwareUpdateConfigurationRunsOperations.cs
+++ b/src/SDKs/Automation/Management.Automation/Generated/SoftwareUpdateConfigurationRunsOperations.cs
@@ -72,7 +72,7 @@ internal SoftwareUpdateConfigurationRunsOperations(AutomationClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="ErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -212,14 +212,13 @@ internal SoftwareUpdateConfigurationRunsOperations(AutomationClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -229,10 +228,6 @@ internal SoftwareUpdateConfigurationRunsOperations(AutomationClient client)
                 }
                 ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
                 ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
                 if (_shouldTrace)
                 {
                     ServiceClientTracing.Error(_invocationId, ex);
@@ -307,7 +302,7 @@ internal SoftwareUpdateConfigurationRunsOperations(AutomationClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="ErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -460,14 +455,13 @@ internal SoftwareUpdateConfigurationRunsOperations(AutomationClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -477,10 +471,6 @@ internal SoftwareUpdateConfigurationRunsOperations(AutomationClient client)
                 }
                 ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
                 ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
                 if (_shouldTrace)
                 {
                     ServiceClientTracing.Error(_invocationId, ex);
diff --git a/src/SDKs/Automation/Management.Automation/Generated/SoftwareUpdateConfigurationsOperations.cs b/src/SDKs/Automation/Management.Automation/Generated/SoftwareUpdateConfigurationsOperations.cs
index 70939562dbae..536505299359 100644
--- a/src/SDKs/Automation/Management.Automation/Generated/SoftwareUpdateConfigurationsOperations.cs
+++ b/src/SDKs/Automation/Management.Automation/Generated/SoftwareUpdateConfigurationsOperations.cs
@@ -75,7 +75,7 @@ internal SoftwareUpdateConfigurationsOperations(AutomationClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="ErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -232,16 +232,15 @@ internal SoftwareUpdateConfigurationsOperations(AutomationClient client)
             System.Net.HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 201 && (int)_statusCode != 400 && (int)_statusCode != 404 && (int)_statusCode != 409)
+            if ((int)_statusCode != 200 && (int)_statusCode != 201)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -251,10 +250,6 @@ internal SoftwareUpdateConfigurationsOperations(AutomationClient client)
                 }
                 ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
                 ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
                 if (_shouldTrace)
                 {
                     ServiceClientTracing.Error(_invocationId, ex);
@@ -339,7 +334,7 @@ internal SoftwareUpdateConfigurationsOperations(AutomationClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="ErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -483,14 +478,13 @@ internal SoftwareUpdateConfigurationsOperations(AutomationClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -500,10 +494,6 @@ internal SoftwareUpdateConfigurationsOperations(AutomationClient client)
                 }
                 ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
                 ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
                 if (_shouldTrace)
                 {
                     ServiceClientTracing.Error(_invocationId, ex);
@@ -570,7 +560,7 @@ internal SoftwareUpdateConfigurationsOperations(AutomationClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="ErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -709,16 +699,15 @@ internal SoftwareUpdateConfigurationsOperations(AutomationClient client)
             System.Net.HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 204 && (int)_statusCode != 404)
+            if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -728,10 +717,6 @@ internal SoftwareUpdateConfigurationsOperations(AutomationClient client)
                 }
                 ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
                 ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
                 if (_shouldTrace)
                 {
                     ServiceClientTracing.Error(_invocationId, ex);
@@ -780,7 +765,7 @@ internal SoftwareUpdateConfigurationsOperations(AutomationClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="ErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -923,14 +908,13 @@ internal SoftwareUpdateConfigurationsOperations(AutomationClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -940,10 +924,6 @@ internal SoftwareUpdateConfigurationsOperations(AutomationClient client)
                 }
                 ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
                 ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
                 if (_shouldTrace)
                 {
                     ServiceClientTracing.Error(_invocationId, ex);
diff --git a/src/SDKs/Automation/Management.Automation/Microsoft.Azure.Management.Automation.csproj b/src/SDKs/Automation/Management.Automation/Microsoft.Azure.Management.Automation.csproj
index 1008797b8b15..f450eba506a7 100644
--- a/src/SDKs/Automation/Management.Automation/Microsoft.Azure.Management.Automation.csproj
+++ b/src/SDKs/Automation/Management.Automation/Microsoft.Azure.Management.Automation.csproj
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <PackageId>Microsoft.Azure.Management.Automation</PackageId>
     <Description>Provides Microsoft Azure Automation management operations including the ability to create, update and delete runbooks and schedules.</Description>
-    <Version>3.0.2-preview</Version>
+    <Version>3.0.3-preview</Version>
     <!-- Remove the Preview description in PackageReleaseNotes once the preview is removed.-->
     <AssemblyTitle>Microsoft Azure Automation Management Library</AssemblyTitle>
     <AssemblyName>Microsoft.Azure.Management.Automation</AssemblyName>
diff --git a/src/SDKs/Automation/Management.Automation/Properties/AssemblyInfo.cs b/src/SDKs/Automation/Management.Automation/Properties/AssemblyInfo.cs
index 3346ef81136d..ddabd2a582af 100644
--- a/src/SDKs/Automation/Management.Automation/Properties/AssemblyInfo.cs
+++ b/src/SDKs/Automation/Management.Automation/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyDescription("Provides Microsoft Azure Automation management operations including the ability to create, update and delete runbooks and schedules.")]
 
 [assembly: AssemblyVersion("3.0.1.0")]
-[assembly: AssemblyFileVersion("3.0.2.0")]
+[assembly: AssemblyFileVersion("3.0.3.0")]
 
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
diff --git a/src/SDKs/_metadata/automation_resource-manager.txt b/src/SDKs/_metadata/automation_resource-manager.txt
index a811f79e5fc2..b3f2676f815e 100644
--- a/src/SDKs/_metadata/automation_resource-manager.txt
+++ b/src/SDKs/_metadata/automation_resource-manager.txt
@@ -1,14 +1,14 @@
 Executing AutoRest command
-cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/automation/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=F:\SDK\SDK3\azure-sdk-for-net\tools\..\src\SDKs\
-2018-05-14 17:17:27 UTC
+cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/automation/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=C:\Users\menein\Source\Repos\me\azure-sdk-for-net\tools\..\src\SDKs\
+2018-05-21 23:41:17 UTC
 1) azure-rest-api-specs repository information
 GitHub fork: Azure
 Branch:      master
-Commit:      e7198697aed47b6781b41f61e68d87a71a998b87
+Commit:      e76b99571744235eb7d16ff55581d6ad21ffd254
 
 2) AutoRest information
 Requested version: latest
-Bootstrapper version:    C:\Users\maromero.REDMOND\AppData\Roaming\npm  `-- autorest@2.0.4262
+Bootstrapper version:    C:\Users\menein\AppData\Roaming\npm  `-- autorest@2.0.4262
 
 
 Latest installed version: