diff --git a/RestSharp.Build/RestSharp.Build.csproj b/RestSharp.Build/RestSharp.Build.csproj
index b47a0dcd3..1892a1640 100644
--- a/RestSharp.Build/RestSharp.Build.csproj
+++ b/RestSharp.Build/RestSharp.Build.csproj
@@ -29,6 +29,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Build.Framework" />
diff --git a/RestSharp.IntegrationTests/StatusCodeTests.cs b/RestSharp.IntegrationTests/StatusCodeTests.cs
index c393a41f9..33bfe529c 100644
--- a/RestSharp.IntegrationTests/StatusCodeTests.cs
+++ b/RestSharp.IntegrationTests/StatusCodeTests.cs
@@ -59,7 +59,7 @@ public void Handles_Different_Root_Element_On_Error()
 				var response = client.Execute<Response>(request);
 
 				Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
-				Assert.Equal("Not found!", response.Data.Message);
+				Assert.Null(response.Data);
 			}
 		}
 
diff --git a/RestSharp.Net4/RestSharp.Net4.csproj b/RestSharp.Net4/RestSharp.Net4.csproj
index 9f701fd0b..8601e79e6 100644
--- a/RestSharp.Net4/RestSharp.Net4.csproj
+++ b/RestSharp.Net4/RestSharp.Net4.csproj
@@ -33,7 +33,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\RestSharp.xml</DocumentationFile>
-    <NoWarn>1591,1573,1658,1584</NoWarn>
+    <NoWarn>1591,1573,1658,1584,1574,1572</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/RestSharp.Silverlight/RestSharp.Silverlight.csproj b/RestSharp.Silverlight/RestSharp.Silverlight.csproj
index 2241e5a16..0d272963f 100644
--- a/RestSharp.Silverlight/RestSharp.Silverlight.csproj
+++ b/RestSharp.Silverlight/RestSharp.Silverlight.csproj
@@ -48,7 +48,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>Bin\Release\RestSharp.Silverlight.xml</DocumentationFile>
-    <NoWarn>1591,1573,1658,1584</NoWarn>
+    <NoWarn>1591,1573,1658,1584,1574,1572</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
diff --git a/RestSharp.Tests/NuSpecUpdateTask.cs b/RestSharp.Tests/NuSpecUpdateTask.cs
index e71403b48..fa9db80e3 100644
--- a/RestSharp.Tests/NuSpecUpdateTask.cs
+++ b/RestSharp.Tests/NuSpecUpdateTask.cs
@@ -67,7 +67,7 @@ public class WhenSpecFileIsValid : BaseNuSpecUpdateTest
                 private string _expectedDescription = "Simple REST and HTTP API Client";
                 private string _expectedAuthors = "John Sheehan, RestSharp Community";
                 private string _expectedOwners = "John Sheehan, RestSharp Community";
-                private Regex _expectedVersion = new Regex(@"^\d+\.\d+\.\d+$", RegexOptions.Compiled);
+                private Regex _expectedVersion = new Regex(@"^\d+\.\d+\.\d+(-\w+)$", RegexOptions.Compiled);
 
                 protected override void Setup()
                 {
diff --git a/RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj b/RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj
index 986661a3e..cd3f4f821 100644
--- a/RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj
+++ b/RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj
@@ -43,7 +43,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>Bin\Release\RestSharp.WindowsPhone.xml</DocumentationFile>
-    <NoWarn>1591,1573,1658,1584</NoWarn>
+    <NoWarn>1591,1573,1658,1584,1574,1572</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
diff --git a/RestSharp/Deserializers/XmlAttributeDeserializer.cs b/RestSharp/Deserializers/XmlAttributeDeserializer.cs
index 9b3f9bec6..2cf8a7d6f 100644
--- a/RestSharp/Deserializers/XmlAttributeDeserializer.cs
+++ b/RestSharp/Deserializers/XmlAttributeDeserializer.cs
@@ -21,6 +21,7 @@
 using System.Linq;
 using System.Xml;
 using System.Xml.Linq;
+using RestSharp.Authenticators.OAuth.Extensions;
 using RestSharp.Extensions;
 
 namespace RestSharp.Deserializers
@@ -109,7 +110,8 @@ private void Map(object x, XElement root)
 
 				var value = GetValueFromXml(root, name, isAttribute);
 
-				if (value == null || value == string.Empty)
+				var stringValue = value as string;
+				if (stringValue.IsNullOrBlank())
 				{
 					// special case for inline list items
 					if (type.IsGenericType)
diff --git a/RestSharp/Extensions/ReflectionExtensions.cs b/RestSharp/Extensions/ReflectionExtensions.cs
index 3c11215aa..416beb071 100644
--- a/RestSharp/Extensions/ReflectionExtensions.cs
+++ b/RestSharp/Extensions/ReflectionExtensions.cs
@@ -85,7 +85,7 @@ public static object ChangeType(this object source, Type newType, CultureInfo cu
 		/// Find a value from a System.Enum by trying several possible variants
 		/// of the string value of the enum.
 		/// </summary>
-		/// <param name="type">Type of enum</typeparam>
+		/// <param name="type">Type of enum</param>
 		/// <param name="value">Value for which to search</param>
 		/// <param name="culture">The culture used to calculate the name variants</param>
 		/// <returns></returns>
diff --git a/RestSharp/RestSharp.csproj b/RestSharp/RestSharp.csproj
index 18fd53ac4..f5458aa24 100644
--- a/RestSharp/RestSharp.csproj
+++ b/RestSharp/RestSharp.csproj
@@ -56,7 +56,8 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Release\RestSharp.xml</DocumentationFile>
-    <NoWarn>1591,1573,1658,1584</NoWarn>
+    <NoWarn>1591,1573,1658,1584,1574,1572</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Build.Framework" />