diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnSignChangeEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnSignChangeEvent.java
index 412650d..7cd0ece 100644
--- a/src/nl/Steffion/BlockHunt/Listeners/OnSignChangeEvent.java
+++ b/src/nl/Steffion/BlockHunt/Listeners/OnSignChangeEvent.java
@@ -21,7 +21,7 @@ public class OnSignChangeEvent implements Listener {
 		if (lines[0] != null) {
 			if (lines[0].equalsIgnoreCase("[" + W.pluginName + "]")) {
 				if (PlayerM.hasPerm(player, PermsC.signcreate, true)) {
-					SignsHandler.createSign(lines, new LocationSerializable(
+					SignsHandler.createSign(event, lines, new LocationSerializable(
 							event.getBlock().getLocation()));
 				}
 			}
diff --git a/src/nl/Steffion/BlockHunt/SignsHandler.java b/src/nl/Steffion/BlockHunt/SignsHandler.java
index 80e8db8..c352089 100644
--- a/src/nl/Steffion/BlockHunt/SignsHandler.java
+++ b/src/nl/Steffion/BlockHunt/SignsHandler.java
@@ -8,10 +8,12 @@ import nl.Steffion.BlockHunt.Serializables.LocationSerializable;
 
 import org.bukkit.Material;
 import org.bukkit.block.Sign;
+import org.bukkit.event.block.SignChangeEvent;
 
 public class SignsHandler {
 
-	public static void createSign(String[] lines, LocationSerializable location) {
+	public static void createSign(SignChangeEvent event, String[] lines,
+			LocationSerializable location) {
 		if (lines[1] != null) {
 			if (lines[1].equalsIgnoreCase("leave")) {
 				boolean saved = false;
@@ -30,9 +32,9 @@ public class SignsHandler {
 					}
 				}
 			} else {
+				boolean saved = false;
 				for (Arena arena : W.arenaList) {
-					if (lines[1].equalsIgnoreCase(arena.arenaName)) {
-						boolean saved = false;
+					if (lines[1].equals(arena.arenaName)) {
 						int number = 1;
 						while (!saved) {
 							if (W.signs.getFile().get(
@@ -52,6 +54,11 @@ public class SignsHandler {
 						}
 					}
 				}
+
+				if (!saved) {
+					MessageM.sendFMessage(event.getPlayer(),
+							ConfigC.error_noArena, true, "name-" + lines[1]);
+				}
 			}
 		}
 	}
@@ -107,9 +114,8 @@ public class SignsHandler {
 					}
 					signblock.update();
 				} else {
-
 					for (Arena arena : W.arenaList) {
-						if (lines[1].contains(arena.arenaName)) {
+						if (lines[1].endsWith(arena.arenaName)) {
 							if (arena.gameState.equals(ArenaState.WAITING)) {
 								ArrayList<String> signLines = (ArrayList<String>) W.config
 										.getFile().getList(