1 files changed, 23 insertions, 24 deletions
diff --git a/src/mscorlib/src/System/ArgumentNullException.cs b/src/mscorlib/src/System/ArgumentNullException.cs
index 661ebd29af..3a86223ccf 100644
--- a/src/mscorlib/src/System/ArgumentNullException.cs
+++ b/src/mscorlib/src/System/ArgumentNullException.cs
@@ -11,44 +11,43 @@
 **
 =============================================================================*/
 
-namespace System {
-    
-    using System;
-    using System.Runtime.Serialization;
-    using System.Runtime.Remoting;
-    using System.Security.Permissions;
-    
+using System.Runtime.Serialization;
+
+namespace System
+{
     // The ArgumentException is thrown when an argument 
     // is null when it shouldn't be.
     // 
-    [System.Runtime.InteropServices.ComVisible(true)]
     [Serializable]
     public class ArgumentNullException : ArgumentException
     {
         // Creates a new ArgumentNullException with its message 
         // string set to a default message explaining an argument was null.
-       public ArgumentNullException() 
-            : base(Environment.GetResourceString("ArgumentNull_Generic")) {
-                // Use E_POINTER - COM used that for null pointers.  Description is "invalid pointer"
-                SetErrorCode(__HResults.E_POINTER);
+        public ArgumentNullException()
+             : base(SR.ArgumentNull_Generic)
+        {
+            // Use E_POINTER - COM used that for null pointers.  Description is "invalid pointer"
+            HResult = __HResults.E_POINTER;
         }
 
-        public ArgumentNullException(String paramName) 
-            : base(Environment.GetResourceString("ArgumentNull_Generic"), paramName) {
-            SetErrorCode(__HResults.E_POINTER);
+        public ArgumentNullException(String paramName)
+            : base(SR.ArgumentNull_Generic, paramName)
+        {
+            HResult = __HResults.E_POINTER;
         }
 
-        public ArgumentNullException(String message, Exception innerException) 
-            : base(message, innerException) {
-            SetErrorCode(__HResults.E_POINTER);
-        }
-            
-        public ArgumentNullException(String paramName, String message) 
-            : base(message, paramName) {
-            SetErrorCode(__HResults.E_POINTER);   
+        public ArgumentNullException(String message, Exception innerException)
+            : base(message, innerException)
+        {
+            HResult = __HResults.E_POINTER;
         }
 
-        protected ArgumentNullException(SerializationInfo info, StreamingContext context) : base(info, context) {
+        public ArgumentNullException(String paramName, String message)
+            : base(message, paramName)
+        {
+            HResult = __HResults.E_POINTER;
         }
+
+        protected ArgumentNullException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }