1 files changed, 19 insertions, 5 deletions
diff --git a/src/main/java/com/p4square/grow/model/Chapter.java b/src/main/java/com/p4square/grow/model/Chapter.java
index 3306bf0..ce1dbb9 100644
--- a/src/main/java/com/p4square/grow/model/Chapter.java
+++ b/src/main/java/com/p4square/grow/model/Chapter.java
@@ -87,15 +87,27 @@ public class Chapter implements Cloneable {
      */
     @JsonIgnore
     public boolean isComplete() {
-        boolean complete = true;
-
         for (VideoRecord r : mVideos.values()) {
             if (r.getRequired() && !r.getComplete()) {
                 return false;
             }
         }
 
-        return complete;
+        return true;
+    }
+
+    /**
+     * @return true if the chapter is required.
+     */
+    @JsonIgnore
+    public boolean isRequired() {
+        for (VideoRecord r : mVideos.values()) {
+            if (r.getRequired()) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     /**
@@ -111,8 +123,10 @@ public class Chapter implements Cloneable {
             }
 
             Date completionDate = video.getCompletionDate();
-            if (completionDate.after(latest)) {
-                latest = completionDate;
+            if (completionDate != null) {
+                if (completionDate.after(latest)) {
+                    latest = completionDate;
+                }
             }
         }
         return latest;