diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlayerSender.java b/src/main/java/buttondevteam/discordplugin/DiscordPlayerSender.java
index 2889a0a..de9caea 100644
--- a/src/main/java/buttondevteam/discordplugin/DiscordPlayerSender.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordPlayerSender.java
@@ -106,7 +106,7 @@ public class DiscordPlayerSender extends DiscordSenderBase implements Player {
 
 	@Override
 	public String getName() {
-		return user.getDisplayName(DiscordPlugin.mainServer);
+		return player.getName();
 	}
 
 	// Find: " (\w+)\(\) \{\s+\/\/ TO\DO Auto-generated method stub\s+return null;" - Replace: " $1() { return player.$1();"
diff --git a/src/main/java/buttondevteam/discordplugin/DiscordSender.java b/src/main/java/buttondevteam/discordplugin/DiscordSender.java
index 33fb168..c9ad56e 100644
--- a/src/main/java/buttondevteam/discordplugin/DiscordSender.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordSender.java
@@ -90,6 +90,8 @@ public class DiscordSender extends DiscordSenderBase implements CommandSender {
 
 	@Override
 	public String getName() {
+		if (user == null)
+			return "Discord user";
 		return user.getDisplayName(DiscordPlugin.mainServer);
 	}
 
diff --git a/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java b/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java
index 65bfd10..172b738 100644
--- a/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java
@@ -14,6 +14,9 @@ import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.IUser;
 
 public abstract class DiscordSenderBase implements IDiscordSender {
+	/**
+	 * May be null.
+	 */
 	protected IUser user;
 	protected IChannel channel;
 
@@ -27,6 +30,11 @@ public abstract class DiscordSenderBase implements IDiscordSender {
 	private volatile String msgtosend = "";
 	private volatile BukkitTask sendtask;
 
+	/**
+	 * Returns the user. May be null.
+	 * 
+	 * @return The user or null.
+	 */
 	public IUser getUser() {
 		return user;
 	}
@@ -51,7 +59,7 @@ public abstract class DiscordSenderBase implements IDiscordSender {
 			if (sendtask == null)
 				sendtask = Bukkit.getScheduler().runTaskLaterAsynchronously(DiscordPlugin.plugin, () -> {
 					DiscordPlugin.sendMessageToChannel(channel,
-							(!broadcast ? user.mention() + "\n" : "") + msgtosend.trim());
+							(!broadcast && user != null ? user.mention() + "\n" : "") + msgtosend.trim());
 					sendtask = null;
 					msgtosend = "";
 				}, 10); // Waits a half second to gather all/most of the different messages
diff --git a/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java
index ba5b396..8be018e 100644
--- a/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java
@@ -1,6 +1,8 @@
 package buttondevteam.discordplugin.listeners;
 
 import buttondevteam.discordplugin.DiscordPlugin;
+import buttondevteam.discordplugin.DiscordSender;
+import buttondevteam.lib.TBMCCoreAPI;
 import sx.blah.discord.api.events.IListener;
 import sx.blah.discord.handle.impl.events.MessageReceivedEvent;
 
@@ -9,18 +11,16 @@ public class AutoUpdaterListener implements IListener<MessageReceivedEvent> {
 	public void handle(MessageReceivedEvent event) {
 		if (!event.getMessage().getChannel().getID().equals(DiscordPlugin.officechannel.getID()))
 			return;
-		if (event.getMessage().getWebhookID() == null)
+		if (!"239123781401051138".equals(event.getMessage().getWebhookID()))
 			return;
-		System.out.println(event.getMessage().getWebhookID());
-		if (event.getMessage().getEmbedded().size() == 0) {
-			System.out.println("No embed");
+		if (event.getMessage().getEmbedded().size() == 0)
 			return;
-		}
 		final String title = event.getMessage().getEmbedded().get(0).getTitle();
-		System.out.println(title);
-		System.out.println(title.indexOf(':'));
-		System.out.println(title.indexOf(']'));
-		System.out.println(title.substring(title.indexOf(':') + 1, title.indexOf(']')));
-		System.out.println(title.contains("new commit"));
+		if (!title.contains("new commit"))
+			return;
+		String branch = title.substring(title.indexOf(':') + 1, title.indexOf(']'));
+		String project = title.substring(title.indexOf('[') + 1, title.indexOf(':'));
+		if (branch.equals("master") || (TBMCCoreAPI.IsTestServer() && branch.equals("dev")))
+			TBMCCoreAPI.UpdatePlugin(project, new DiscordSender(null, DiscordPlugin.officechannel));
 	}
 }