diff --git a/src/main/java/se/diabol/jenkins/workflow/model/Task.java b/src/main/java/se/diabol/jenkins/workflow/model/Task.java
index 7d97be163..a3e14d32d 100644
--- a/src/main/java/se/diabol/jenkins/workflow/model/Task.java
+++ b/src/main/java/se/diabol/jenkins/workflow/model/Task.java
@@ -203,7 +203,7 @@ private static Status runningStatus(long buildTimestamp, int progress) {
 
     private static int progressOfStage(WorkflowRun build, Stage currentStage) {
         Run previousRun = workflowApi.lastFinishedRunFor(Name.of(build));
-        if (!previousRun.hasStage(currentStage.name)) {
+        if (previousRun == null || !previousRun.hasStage(currentStage.name)) {
             return 99;
         }