diff --git a/RandomTeleport v1.0/src/main/java/de/themoep/bukkit/plugin/RandomTeleport/RandomTeleport.java b/RandomTeleport v1.0/src/main/java/de/themoep/bukkit/plugin/RandomTeleport/RandomTeleport.java
index ed7b1fa..9da191f 100644
--- a/RandomTeleport v1.0/src/main/java/de/themoep/bukkit/plugin/RandomTeleport/RandomTeleport.java	
+++ b/RandomTeleport v1.0/src/main/java/de/themoep/bukkit/plugin/RandomTeleport/RandomTeleport.java	
@@ -246,6 +246,9 @@ public class RandomTeleport extends JavaPlugin implements CommandExecutor {
                                 return true;
                             }
                             for(i = i+1; i < args.length; i++) {
+                                if(args[i].startsWith("-")) {
+                                    break;
+                                }
                                 try {
                                     biomeList.add(Biome.valueOf(args[i].toUpperCase()));
                                 } catch(IllegalArgumentException e) {
@@ -253,6 +256,10 @@ public class RandomTeleport extends JavaPlugin implements CommandExecutor {
                                     return true;
                                 }
                             }
+                            if(biomeList.size() == 0) {
+                                sender.sendMessage(ChatColor.DARK_RED + "Error:" + ChatColor.RED + " Please specify at least one biome after the -biome option!");
+                                return true;
+                            }
 
                             // if -x/-z option is selected set x/z it to its values
                         } else if(args[i].equalsIgnoreCase("-x") || args[i].equalsIgnoreCase("-xPos")) {