diff --git a/pom.xml b/pom.xml
index f7fd1e2..26b7ba3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>Hadder</groupId>
     <artifactId>Hadder</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <name>Hadder</name>
     <inceptionYear>2019</inceptionYear>
     <description>Hadder is a multi-purpose Discord bot.</description>
diff --git a/src/main/java/one/bbn/hadder/db/Mongo.java b/src/main/java/one/bbn/hadder/db/Mongo.java
index f89916b..3706013 100644
--- a/src/main/java/one/bbn/hadder/db/Mongo.java
+++ b/src/main/java/one/bbn/hadder/db/Mongo.java
@@ -43,7 +43,11 @@ public class Mongo {
         BasicDBObject whereQuery = new BasicDBObject();
         whereQuery.put(where, what);
         FindIterable<Document> it = collection.find(whereQuery);
-        return it.cursor().next().get(column);
+        try {
+            return it.cursor().next().get(column);
+        } catch (NoSuchElementException ignore) {
+            return null;
+        }
     }
 
     public JSONObject getObjectByID(String collection, String id) {
@@ -133,8 +137,7 @@ public class Mongo {
     }
 
     public boolean hasStarboardMessage(String message_id) {
-        this.getByID("stars", "id", message_id, "guild");
-        return true;
+        return this.getByID("stars", "id", message_id, "guild") != null;
     }
 
     public void insertStarboardMessage(String message_id, String guild_id, String starboard_message_id) {