diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar
index 7fc3ee5..9d6b2c3 100644
Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ
diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
index a8fb4c5..d973abd 100644
--- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
+++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
@@ -471,7 +471,7 @@ public class PlayerListener implements Listener { // 2015.07.16.
 				return;
 			}
 		} else if (player.CurrentChannel.equals(Channel.AdminChat)) {
-			try {
+			try { // TODO: Put message JSON into it's structure
 				if (!event.getPlayer().isOp()) {
 					event.getPlayer().sendMessage(
 							"§cYou need to be an OP to use this channel.");
@@ -665,7 +665,7 @@ public class PlayerListener implements Listener { // 2015.07.16.
 					if (town.hasNation()) {
 						Resident res = tu.getResidentMap().get(
 								event.getPlayer().getName());
-						if (res.hasTown()) {
+						if (res != null && res.hasTown()) {
 							Town town2 = res.getTown();
 							if (town2.hasNation()) {
 								if (town.getNation().getEnemies()
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class
index 026b988..4a97d76 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class differ