diff --git a/core/src/main/java/me/pikamug/quests/quests/BukkitQuest.java b/core/src/main/java/me/pikamug/quests/quests/BukkitQuest.java
index 33812e730..d3efae8cc 100644
--- a/core/src/main/java/me/pikamug/quests/quests/BukkitQuest.java
+++ b/core/src/main/java/me/pikamug/quests/quests/BukkitQuest.java
@@ -292,6 +292,9 @@ public class BukkitQuest implements Quest {
 
     private void doNextStage(final Quester quester, final boolean allowSharedProgress) {
         final Stage currentStage = quester.getCurrentStage(this);
+        if (currentStage == null) {
+            return;
+        }
         if (currentStage.getFinishAction() != null) {
             currentStage.getFinishAction().fire(quester, this);
         }
diff --git a/pom.xml b/pom.xml
index 2f66608c8..a98ff23d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     </modules>
 
     <properties>
-    	<revision>5.0.0</revision>
+    	<revision>5.0.1</revision>
         <updatePomFile>true</updatePomFile>
         <flattenMode>resolveCiFriendliesOnly</flattenMode>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>