Merge branch 'master' of github.com:ucam-cl-dtg/pottery-backend

ucam-cl-dtg · Dec 20, 2018 · be34e93 · be34e93
2 parents 1d527aa + de435d7
commit be34e93
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/uk/ac/cam/cl/dtg/teaching/pottery/task/TaskDetail.java b/src/main/java/uk/ac/cam/cl/dtg/teaching/pottery/task/TaskDetail.java
@@ -261,7 +261,7 @@ public TaskInfo toTaskInfo() {
         difficulty,
         recommendedTimeMinutes,
         problemStatement,
-        parameterisation.getCount(),
+        parameterisation != null ? parameterisation.getCount() : 0,
         questions,
         variants,
         actions.keySet());