diff --git a/src/main/java/one/bbn/hadder/db/Mongo.java b/src/main/java/one/bbn/hadder/db/Mongo.java
index 3f28275..62aecd0 100644
--- a/src/main/java/one/bbn/hadder/db/Mongo.java
+++ b/src/main/java/one/bbn/hadder/db/Mongo.java
@@ -20,10 +20,10 @@ import com.mongodb.BasicDBObject;
 import com.mongodb.client.*;
 import one.bbn.hadder.core.Config;
 import org.bson.Document;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.lang.reflect.Field;
+import java.util.NoSuchElementException;
 
 public class Mongo {
 
@@ -49,18 +49,13 @@ public class Mongo {
     public JSONObject getObjectByID(String collection, String id) {
         BasicDBObject whereQuery = new BasicDBObject();
         whereQuery.put("id", id);
-        String response = db.getCollection(collection).find(whereQuery).cursor().next().toJson();
         try {
+            String response = db.getCollection(collection).find(whereQuery).cursor().next().toJson();
             return new JSONObject(response);
-        } catch (JSONException e) {
+        } catch (NoSuchElementException e) {
             insertUser(id);
             String response2 = db.getCollection(collection).find(whereQuery).cursor().next().toJson();
-            try {
-                return new JSONObject(response2);
-            } catch (JSONException ex) {
-                ex.printStackTrace();
-                return null;
-            }
+            return new JSONObject(response2);
         }
     }
 
diff --git a/src/main/java/one/bbn/hadder/listener/GuildListener.java b/src/main/java/one/bbn/hadder/listener/GuildListener.java
index 37a0666..a940ed3 100644
--- a/src/main/java/one/bbn/hadder/listener/GuildListener.java
+++ b/src/main/java/one/bbn/hadder/listener/GuildListener.java
@@ -20,7 +20,6 @@ import one.bbn.hadder.core.Config;
 import one.bbn.hadder.db.Mongo;
 import one.bbn.hadder.utils.BotList;
 import one.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
 import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
 import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
@@ -39,14 +38,6 @@ public class GuildListener extends ListenerAdapter {
     }
 
     public void onGuildJoin(GuildJoinEvent e) {
-        new Thread(() -> {
-            for (Member member : e.getGuild().getMembers()) {
-                if (!member.getUser().getId().equals(e.getJDA().getSelfUser().getId())) {
-                    mongo.insertUser(member.getUser().getId());
-                }
-            }
-        }).start();
-
         mongo.insertGuild(e.getGuild().getId());
         e.getJDA().getTextChannelById("759783393230979142").sendMessage(new MessageEditor(null, null).getMessage(MessageEditor.MessageType.INFO)
                 .setTitle("Joined Server")
diff --git a/src/main/java/one/bbn/hadder/listener/ReadyListener.java b/src/main/java/one/bbn/hadder/listener/ReadyListener.java
index af4c03e..407db51 100644
--- a/src/main/java/one/bbn/hadder/listener/ReadyListener.java
+++ b/src/main/java/one/bbn/hadder/listener/ReadyListener.java
@@ -19,6 +19,7 @@ package one.bbn.hadder.listener;
 import one.bbn.hadder.core.Config;
 import net.dv8tion.jda.api.events.ReadyEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import one.bbn.hadder.utils.BotList;
 
 import javax.annotation.Nonnull;
 
@@ -32,7 +33,6 @@ public class ReadyListener extends ListenerAdapter {
 
     @Override
     public void onReady(@Nonnull ReadyEvent e) {
-        //TODO: Renew all bot lists
-        //new BotList(config).post();
+        new BotList(config).post();
     }
 }