diff --git a/Mage/src/mage/game/match/MatchOptions.java b/Mage/src/mage/game/match/MatchOptions.java
index ad6187f224..b54e3adabb 100644
--- a/Mage/src/mage/game/match/MatchOptions.java
+++ b/Mage/src/mage/game/match/MatchOptions.java
@@ -125,6 +125,9 @@ public class MatchOptions implements Serializable {
     }
 
     public int getPriorityTime() {
+        if (matchTimeLimit == null) {
+            return MatchTimeLimit.NONE.getTimeLimit();
+        }
         return matchTimeLimit.getTimeLimit();
     }