diff --git a/src/net/JNetReflector/InternalConst.cs b/src/net/JNetReflector/InternalConst.cs
index 33b6a0655a..c3e5164ff8 100644
--- a/src/net/JNetReflector/InternalConst.cs
+++ b/src/net/JNetReflector/InternalConst.cs
@@ -121,55 +121,55 @@ public static bool IsJavaLangException(string canonicalName)
         static readonly IEnumerable<string> JavaLangExceptions = new string[]
         {
             "java.lang.Throwable",
-            "java.lang.ArithmeticException",
-            "java.lang.ArrayIndexOutOfBoundsException",
-            "java.lang.ArrayStoreException",
-            "java.lang.ClassCastException",
-            "java.lang.ClassNotFoundException",
-            "java.lang.CloneNotSupportedException",
-            "java.lang.EnumConstantNotPresentException",
-            "java.lang.Exception",
-            "java.lang.IllegalAccessException",
-            "java.lang.IllegalArgumentException",
-            "java.lang.IllegalMonitorStateException",
-            "java.lang.IllegalStateException",
-            "java.lang.IllegalThreadStateException",
-            "java.lang.IndexOutOfBoundsException",
-            "java.lang.InstantiationException",
-            "java.lang.InterruptedException",
-            "java.lang.NegativeArraySizeException",
-            "java.lang.NoSuchFieldException",
-            "java.lang.NoSuchMethodException",
-            "java.lang.NullPointerException",
-            "java.lang.NumberFormatException",
-            "java.lang.ReflectiveOperationException",
-            "java.lang.RuntimeException",
-            "java.lang.SecurityException",
-            "java.lang.StringIndexOutOfBoundsException",
-            "java.lang.TypeNotPresentException",
-            "java.lang.UnsupportedOperationException",
-            "java.lang.AbstractMethodError",
-            "java.lang.AssertionError",
-            "java.lang.BootstrapMethodError",
-            "java.lang.ClassCircularityError",
-            "java.lang.ClassFormatError",
-            "java.lang.Error",
-            "java.lang.ExceptionInInitializerError",
-            "java.lang.IllegalAccessError",
-            "java.lang.IncompatibleClassChangeError",
-            "java.lang.InstantiationError",
-            "java.lang.InternalError",
-            "java.lang.LinkageError",
-            "java.lang.NoClassDefFoundError",
-            "java.lang.NoSuchFieldError",
-            "java.lang.NoSuchMethodError",
-            "java.lang.OutOfMemoryError",
-            "java.lang.StackOverflowError",
-            "java.lang.UnknownError",
-            "java.lang.UnsatisfiedLinkError",
-            "java.lang.UnsupportedClassVersionError",
-            "java.lang.VerifyError",
-            "java.lang.VirtualMachineError",
+            //"java.lang.ArithmeticException",
+            //"java.lang.ArrayIndexOutOfBoundsException",
+            //"java.lang.ArrayStoreException",
+            //"java.lang.ClassCastException",
+            //"java.lang.ClassNotFoundException",
+            //"java.lang.CloneNotSupportedException",
+            //"java.lang.EnumConstantNotPresentException",
+            //"java.lang.Exception",
+            //"java.lang.IllegalAccessException",
+            //"java.lang.IllegalArgumentException",
+            //"java.lang.IllegalMonitorStateException",
+            //"java.lang.IllegalStateException",
+            //"java.lang.IllegalThreadStateException",
+            //"java.lang.IndexOutOfBoundsException",
+            //"java.lang.InstantiationException",
+            //"java.lang.InterruptedException",
+            //"java.lang.NegativeArraySizeException",
+            //"java.lang.NoSuchFieldException",
+            //"java.lang.NoSuchMethodException",
+            //"java.lang.NullPointerException",
+            //"java.lang.NumberFormatException",
+            //"java.lang.ReflectiveOperationException",
+            //"java.lang.RuntimeException",
+            //"java.lang.SecurityException",
+            //"java.lang.StringIndexOutOfBoundsException",
+            //"java.lang.TypeNotPresentException",
+            //"java.lang.UnsupportedOperationException",
+            //"java.lang.AbstractMethodError",
+            //"java.lang.AssertionError",
+            //"java.lang.BootstrapMethodError",
+            //"java.lang.ClassCircularityError",
+            //"java.lang.ClassFormatError",
+            //"java.lang.Error",
+            //"java.lang.ExceptionInInitializerError",
+            //"java.lang.IllegalAccessError",
+            //"java.lang.IncompatibleClassChangeError",
+            //"java.lang.InstantiationError",
+            //"java.lang.InternalError",
+            //"java.lang.LinkageError",
+            //"java.lang.NoClassDefFoundError",
+            //"java.lang.NoSuchFieldError",
+            //"java.lang.NoSuchMethodError",
+            //"java.lang.OutOfMemoryError",
+            //"java.lang.StackOverflowError",
+            //"java.lang.UnknownError",
+            //"java.lang.UnsatisfiedLinkError",
+            //"java.lang.UnsupportedClassVersionError",
+            //"java.lang.VerifyError",
+            //"java.lang.VirtualMachineError",
         };
 
 
diff --git a/src/net/JNetReflector/JNetReflector.csproj b/src/net/JNetReflector/JNetReflector.csproj
index 5409f9621f..166a3dbf4a 100644
--- a/src/net/JNetReflector/JNetReflector.csproj
+++ b/src/net/JNetReflector/JNetReflector.csproj
@@ -51,49 +51,15 @@
     <None Remove="Templates\SingleProperty.template" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\JNet\Developed\Java\Lang\AbstractMethodError.cs" Link="Java\Lang\AbstractMethodError.cs" />
     <Compile Include="..\JNet\Developed\Java\Lang\Annotation\Annotation.cs" Link="Java\Lang\Annotation\Annotation.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\ArithmeticException.cs" Link="Java\Lang\ArithmeticException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\ArrayIndexOutOfBoundsException.cs" Link="Java\Lang\ArrayIndexOutOfBoundsException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\ArrayStoreException.cs" Link="Java\Lang\ArrayStoreException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\AssertionError.cs" Link="Java\Lang\AssertionError.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\BootstrapMethodError.cs" Link="Java\Lang\BootstrapMethodError.cs" />
     <Compile Include="..\JNet\Developed\Java\Lang\Class.cs" Link="Java\Lang\Class.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\ClassCastException.cs" Link="Java\Lang\ClassCastException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\ClassCircularityError.cs" Link="Java\Lang\ClassCircularityError.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\ClassFormatError.cs" Link="Java\Lang\ClassFormatError.cs" />
     <Compile Include="..\JNet\Developed\Java\Lang\ClassLoader.cs" Link="Java\Lang\ClassLoader.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\ClassNotFoundException.cs" Link="Java\Lang\ClassNotFoundException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\CloneNotSupportedException.cs" Link="Java\Lang\CloneNotSupportedException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\EnumConstantNotPresentException.cs" Link="Java\Lang\EnumConstantNotPresentException.cs" />
     <Compile Include="..\JNet\Developed\Java\Lang\Error.cs" Link="Java\Lang\Error.cs" />
     <Compile Include="..\JNet\Developed\Java\Lang\Exception.cs" Link="Java\Lang\Exception.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\ExceptionInInitializerError.cs" Link="Java\Lang\ExceptionInInitializerError.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\IllegalAccessError.cs" Link="Java\Lang\IllegalAccessError.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\IllegalAccessException.cs" Link="Java\Lang\IllegalAccessException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\IllegalArgumentException.cs" Link="Java\Lang\IllegalArgumentException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\IllegalMonitorStateException.cs" Link="Java\Lang\IllegalMonitorStateException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\IllegalStateException.cs" Link="Java\Lang\IllegalStateException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\IllegalThreadStateException.cs" Link="Java\Lang\IllegalThreadStateException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\IncompatibleClassChangeError.cs" Link="Java\Lang\IncompatibleClassChangeError.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\IndexOutOfBoundsException.cs" Link="Java\Lang\IndexOutOfBoundsException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\InstantiationError.cs" Link="Java\Lang\InstantiationError.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\InstantiationException.cs" Link="Java\Lang\InstantiationException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\InternalError.cs" Link="Java\Lang\InternalError.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\InterruptedException.cs" Link="Java\Lang\InterruptedException.cs" />
     <Compile Include="..\JNet\Developed\Java\Lang\Iterable.cs" Link="Java\Lang\Iterable.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\LinkageError.cs" Link="Java\Lang\LinkageError.cs" />
     <Compile Include="..\JNet\Developed\Java\Lang\Module.cs" Link="Java\Lang\Module.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\NegativeArraySizeException.cs" Link="Java\Lang\NegativeArraySizeException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\NoClassDefFoundError.cs" Link="Java\Lang\NoClassDefFoundError.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\NoSuchFieldError.cs" Link="Java\Lang\NoSuchFieldError.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\NoSuchFieldException.cs" Link="Java\Lang\NoSuchFieldException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\NoSuchMethodError.cs" Link="Java\Lang\NoSuchMethodError.cs" />
     <Compile Include="..\JNet\Developed\Java\Lang\NoSuchMethodException.cs" Link="Java\Lang\NoSuchMethodException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\NullPointerException.cs" Link="Java\Lang\NullPointerException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\NumberFormatException.cs" Link="Java\Lang\NumberFormatException.cs" />
     <Compile Include="..\JNet\Developed\Java\Lang\Object.cs" Link="Java\Lang\Object.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\OutOfMemoryError.cs" Link="Java\Lang\OutOfMemoryError.cs" />
     <Compile Include="..\JNet\Developed\Java\Lang\Package.cs" Link="Java\Lang\Package.cs" />
     <Compile Include="..\JNet\Developed\Java\Lang\ReflectiveOperationException.cs" Link="Java\Lang\ReflectiveOperationException.cs" />
     <Compile Include="..\JNet\Developed\Java\Lang\Reflect\AccessibleObject.cs" Link="Java\Lang\Reflect\AccessibleObject.cs" />
@@ -111,19 +77,8 @@
     <Compile Include="..\JNet\Developed\Java\Lang\Reflect\Type.cs" Link="Java\Lang\Reflect\Type.cs" />
     <Compile Include="..\JNet\Developed\Java\Lang\Reflect\TypeVariable.cs" Link="Java\Lang\Reflect\TypeVariable.cs" />
     <Compile Include="..\JNet\Developed\Java\Lang\Reflect\WildcardType.cs" Link="Java\Lang\Reflect\WildcardType.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\RuntimeException.cs" Link="Java\Lang\RuntimeException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\SecurityException.cs" Link="Java\Lang\SecurityException.cs" />
     <Compile Include="..\JNet\Developed\Java\Lang\SecurityManager.cs" Link="Java\Lang\SecurityManager.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\StackOverflowError.cs" Link="Java\Lang\StackOverflowError.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\StringIndexOutOfBoundsException.cs" Link="Java\Lang\StringIndexOutOfBoundsException.cs" />
     <Compile Include="..\JNet\Developed\Java\Lang\Throwable.cs" Link="Java\Lang\Throwable.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\TypeNotPresentException.cs" Link="Java\Lang\TypeNotPresentException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\UnknownError.cs" Link="Java\Lang\UnknownError.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\UnsatisfiedLinkError.cs" Link="Java\Lang\UnsatisfiedLinkError.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\UnsupportedClassVersionError.cs" Link="Java\Lang\UnsupportedClassVersionError.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\UnsupportedOperationException.cs" Link="Java\Lang\UnsupportedOperationException.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\VerifyError.cs" Link="Java\Lang\VerifyError.cs" />
-    <Compile Include="..\JNet\Developed\Java\Lang\VirtualMachineError.cs" Link="Java\Lang\VirtualMachineError.cs" />
     <Compile Include="..\JNet\Developed\Java\Util\Collection.cs" Link="Java\Util\Collection.cs" />
     <Compile Include="..\JNet\Developed\Java\Util\Iterator.cs" Link="Java\Util\Iterator.cs" />
     <Compile Include="..\JNet\JNetCoreBase.cs" Link="JNetCoreBase.cs" />