From 688f2035a67cf1dc09b8a3339ae8b4e37a030d5d Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 1 Mar 2017 16:21:01 +0100
Subject: [PATCH] fix potential crash

---
 .../habitrpgwrapper/lib/models/SubscriptionPlan.java         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
index d1950d84d..265e6516a 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
@@ -50,7 +50,10 @@ public class SubscriptionPlan extends BaseModel {
 
     public boolean isActive() {
         Date today = new Date();
-        return planId != null && this.dateTerminated == null || this.dateTerminated.after(today);
+        if (this.dateTerminated == null) {
+            return true;
+        }
+        return planId != null || this.dateTerminated.after(today);
     }
 
     @Override