diff --git a/src/main/java/org/json/JSONBuilder.java b/src/main/java/org/json/JSONBuilder.java
index 67c9b94..36f5580 100644
--- a/src/main/java/org/json/JSONBuilder.java
+++ b/src/main/java/org/json/JSONBuilder.java
@@ -40,14 +40,14 @@ public class JSONBuilder {
    *   <li>{@code String.class} -> Identity function</li>
    * </ul>
    */
-  private static final Map<Class<?>,  TypeConverter<?>> classMapping = new HashMap<>();
+  private static final Map<Class<?>,  TypeConverter<?>> classMapping = new HashMap<Class<?>,  TypeConverter<?>>();
 
   /**
    * A mapping from collection interface types to suppliers that produce
    * instances of concrete collection implementations.
    *
    */
-  private static final Map<Class<?>, InstanceCreator<?>> collectionMapping = new HashMap<>();
+  private static final Map<Class<?>, InstanceCreator<?>> collectionMapping = new HashMap<Class<?>, InstanceCreator<?>>();
   
    // Static initializer block to populate default mappings
    static {
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index f5d2bd6..db4ec98 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -3283,7 +3283,13 @@ public class JSONObject {
           }
         }
         return obj;
-      } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
+      } catch (NoSuchMethodException e) {
+        throw new JSONException(e);
+      } catch (InstantiationException e) {
+        throw new JSONException(e);
+      } catch (IllegalAccessException e) {
+        throw new JSONException(e);
+      } catch (InvocationTargetException e) {
         throw new JSONException(e);
       }
     }
@@ -3331,7 +3337,13 @@ public class JSONObject {
           }
         }
         return collection;
-      } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
+      } catch (NoSuchMethodException e) {
+        throw new JSONException(e);
+      } catch (InstantiationException e) {
+        throw new JSONException(e);
+      } catch (IllegalAccessException e) {
+        throw new JSONException(e);
+      } catch (InvocationTargetException e) {
         throw new JSONException(e);
       }
     }