diff --git a/main/src/main/java/me/blackvein/quests/listeners/CmdExecutor.java b/main/src/main/java/me/blackvein/quests/listeners/CmdExecutor.java
index 0c69cc45a..6cac40fe1 100644
--- a/main/src/main/java/me/blackvein/quests/listeners/CmdExecutor.java
+++ b/main/src/main/java/me/blackvein/quests/listeners/CmdExecutor.java
@@ -1224,7 +1224,7 @@ public class CmdExecutor implements CommandExecutor {
             int stage = -1;
             if (args.length > 3) {
                 try {
-                    stage = Integer.parseInt(args[3]);
+                    stage = Integer.parseInt(args[args.length - 1]);
                 } catch (NumberFormatException e) {
                     cs.sendMessage(ChatColor.YELLOW + Lang.get("inputNum"));
                 }
diff --git a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
index d84e15da9..c8c90d922 100644
--- a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
+++ b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
@@ -1068,9 +1068,11 @@ public class PlayerListener implements Listener {
             if (plugin.canUseQuests(uuid)) {
                 Quester quester = plugin.getQuester(uuid);
                 for (Quest quest : plugin.getQuests()) {
-                    if (quester.getCurrentQuests().containsKey(quest) 
-                            && quester.getCurrentStage(quest).containsObjective("reachLocation")) {
-                        quester.reachLocation(quest, location);
+                    if (quester.getCurrentQuests().containsKey(quest)) {
+                        if (quester.getCurrentStage(quest) != null 
+                                && quester.getCurrentStage(quest).containsObjective("reachLocation")) {
+                            quester.reachLocation(quest, location);
+                        }
                     }
                     
                     quester.dispatchMultiplayerEverything(quest, "reachLocation", (Quester q) -> {