diff --git a/Changelog.txt b/Changelog.txt
index 375b9e26f..394922d1b 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -20,6 +20,7 @@ Version 1.3.06-dev
  = Fixed bug with Nether Wart not awarding XP
  = Fixed bug with fishing treasures when treasures list is empty
  = Fixed bug with only getting one level when there was enough XP for multiple levels.
+ ! Changed mcremove to check for users in the MySQL DB before sending queries to remove them
  ! Changed how the tree feller threshold worked for the better
  ! Changed /mcremove to no longer kick players when they are removed from database
  ! Changed /mcremove to work on offline users for FlatFile
diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java
index 4cdefe196..31d8a7093 100644
--- a/src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java
@@ -44,8 +44,10 @@ public class McremoveCommand implements CommandExecutor {
         //If the server is using MySQL
         if(LoadProperties.useMySQL)
         {
-            int userId = mcMMO.database.getInt("SELECT id FROM "+LoadProperties.MySQLtablePrefix+"users WHERE user = '" + playerName + "'");
+            int userId = 0;
+            userId = mcMMO.database.getInt("SELECT id FROM "+LoadProperties.MySQLtablePrefix+"users WHERE user = '" + playerName + "'");
             
+            if(userId > 0) {
             //Remove user from tables
             mcMMO.database.write("DELETE FROM "
                     +LoadProperties.MySQLdbName+"."
@@ -73,6 +75,9 @@ public class McremoveCommand implements CommandExecutor {
             +LoadProperties.MySQLtablePrefix+"experience.user_id="+userId);
 
             sender.sendMessage("User "+playerName+" removed from MySQL DB!"); //TODO: Needs more locale.
+            } else {
+                sender.sendMessage("Unable to find player named "+playerName+" in the database!");
+            }
         } else {
             if(removeFlatFileUser(playerName)) {
                 sender.sendMessage(ChatColor.GREEN+"[mcMMO] It worked! User was removed.");