diff --git a/src/com/sk89q/worldguard/bukkit/commands/CommandRegionFlag.java b/src/com/sk89q/worldguard/bukkit/commands/CommandRegionFlag.java
index c96efe85..057b0ee2 100644
--- a/src/com/sk89q/worldguard/bukkit/commands/CommandRegionFlag.java
+++ b/src/com/sk89q/worldguard/bukkit/commands/CommandRegionFlag.java
@@ -81,6 +81,7 @@ public boolean handle(CommandSender sender, String senderName, String command, S
 
             if (nfo == null) {
                 sender.sendMessage(ChatColor.RED + "Unknown flag specified.");
+                return true;
             }
 
             boolean validValue = false;
@@ -158,6 +159,7 @@ public boolean handle(CommandSender sender, String senderName, String command, S
 
                         } else {
                             player.sendMessage(ChatColor.RED + "You must set the " + nameStr + " location inside the region it belongs to.");
+                            return true;
                         }
 
                     } else if (valueStr.equals("delete")) {
@@ -182,7 +184,7 @@ public boolean handle(CommandSender sender, String senderName, String command, S
 
             String fullFlagname = nameStr;
             if (subnameStr != null) {
-                nameStr += " " + subnameStr;
+                fullFlagname += " " + subnameStr;
             }
 
             if (!validValue) {
diff --git a/src/com/sk89q/worldguard/bukkit/commands/FlagInfo.java b/src/com/sk89q/worldguard/bukkit/commands/FlagInfo.java
index 7d3bc149..4f42a882 100644
--- a/src/com/sk89q/worldguard/bukkit/commands/FlagInfo.java
+++ b/src/com/sk89q/worldguard/bukkit/commands/FlagInfo.java
@@ -58,13 +58,11 @@ public static enum FlagValueType { STRING, BOOLEAN, INT, FLOAT, DOUBLE, STATE, L
         flagList.add(new FlagInfo("waterflow", null, FlagValueType.STATE, "states", "waterflow"));
         flagList.add(new FlagInfo("iconomy", "buyable", FlagValueType.BOOLEAN, "iconomy", "buyable"));
         flagList.add(new FlagInfo("iconomy", "price", FlagValueType.INT, "iconomy", "price"));
-        flagList.add(new FlagInfo("spawn", "", FlagValueType.LOCATION, "spawn", ""));
-        flagList.add(new FlagInfo("teleport", "", FlagValueType.LOCATION, "teleport", ""));
+        flagList.add(new FlagInfo("spawn", "*", FlagValueType.LOCATION, "spawn", ""));
+        flagList.add(new FlagInfo("teleport", "*", FlagValueType.LOCATION, "teleport", ""));
     }
 
     public static FlagInfo getFlagInfo(String name, String subName) {
-
-        System.out.println(name + " " + subName);
         
         for (FlagInfo nfo : flagList) {
             if (name.equals(nfo.name)) {