From 6ffb0a2d99333fd7754e8f434cbdcb1262a8af1b Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Mon, 6 Apr 2020 22:47:36 +0200
Subject: [PATCH] Implement bad fix

---
 src/main/java/com/bbn/hadder/Rethink.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java
index 6be8bdd..5f8ee59 100644
--- a/src/main/java/com/bbn/hadder/Rethink.java
+++ b/src/main/java/com/bbn/hadder/Rethink.java
@@ -22,6 +22,7 @@ import com.rethinkdb.gen.exc.ReqlNonExistenceError;
 import com.rethinkdb.gen.exc.ReqlOpFailedError;
 import com.rethinkdb.net.Connection;
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.lang.reflect.Field;
@@ -78,7 +79,12 @@ public class Rethink {
 
     public JSONObject getObjectByID(String table, String id) {
         String response = r.table(table).get(id).toJson().run(conn);
-        return new JSONObject(response);
+        try {
+            return new JSONObject(response);
+        } catch (JSONException e) {
+            System.out.println(response);
+            return null;
+        }
     }
 
     public void insert(String table, Object object) {