diff --git a/AutoRest/AutoRest.Core/GlobalSuppressions.cs b/AutoRest/AutoRest.Core/GlobalSuppressions.cs
index 560619ada4..df197f6d5a 100644
--- a/AutoRest/AutoRest.Core/GlobalSuppressions.cs
+++ b/AutoRest/AutoRest.Core/GlobalSuppressions.cs
@@ -60,4 +60,3 @@
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ServiceClient.#Methods")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ServiceClient.#Properties")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ParameterTransformation.#ParameterMappings")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Scope = "member", Target = "Microsoft.Rest.Generator.Settings.#Create(System.Collections.Generic.IDictionary`2<System.String,System.Object>)")]
\ No newline at end of file
diff --git a/AutoRest/AutoRest.Core/Settings.cs b/AutoRest/AutoRest.Core/Settings.cs
index aef168e0bf..81ea5ca05c 100644
--- a/AutoRest/AutoRest.Core/Settings.cs
+++ b/AutoRest/AutoRest.Core/Settings.cs
@@ -326,7 +326,7 @@ public static void PopulateSettings(object entityToPopulate, IDictionary<string,
                     {
                         try
                         {
-                            if (setting.Value.ToString().IsNullOrEmpty() && property.PropertyType == typeof(bool))
+                            if (property.PropertyType == typeof(bool) && (setting.Value == null || setting.Value.ToString().IsNullOrEmpty()))
                             {
                                 property.SetValue(entityToPopulate, true);
                             }
diff --git a/AutoRest/Generators/CSharp/CSharp/CSharpCodeGenerator.cs b/AutoRest/Generators/CSharp/CSharp/CSharpCodeGenerator.cs
index 201402c840..83423b87c0 100644
--- a/AutoRest/Generators/CSharp/CSharp/CSharpCodeGenerator.cs
+++ b/AutoRest/Generators/CSharp/CSharp/CSharpCodeGenerator.cs
@@ -115,7 +115,6 @@ private void PopulateAdditionalProperties(ServiceClient serviceClient)
             }
         }
 
-
         [SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Reflection.Assembly.LoadFrom")]
         private HashSet<string> ResolveExternalReferences(ServiceClient serviceClient)
         {
@@ -167,7 +166,6 @@ private static HashSet<string> ResolveExternalReferences(ServiceClient serviceCl
                             Properties.Resources.ConflictingTypesError, typeGroup.Key,
                             string.Join(", ", referenceAssemblies.Select(a => a.GetName())));
                 }
-
             }
             foreach (var model in modelTypesToRemove)
             {