Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/SectionContentsBean.java
===================================================================
--- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/SectionContentsBean.java	(revision 131415)
+++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/SectionContentsBean.java	(working copy)
@@ -24,8 +24,11 @@
 package org.sakaiproject.tool.assessment.ui.bean.delivery;
 
 import java.io.Serializable;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -431,9 +434,21 @@
           if(randomDrawDate != null && !"".equals(randomDrawDate)){
 
         	  try{
-        		  //The Date Time is in ISO format
-        		  DateTimeFormatter fmt = ISODateTimeFormat.dateTime();
-        		  DateTime drawDate = fmt.parseDateTime(randomDrawDate);
+
+        		// bjones86 - SAM-1604
+				DateTime drawDate;
+				DateTimeFormatter fmt = ISODateTimeFormat.dateTime();	//The Date Time is in ISO format
+				try {
+					drawDate = fmt.parseDateTime(randomDrawDate);
+				} catch(IllegalStateException ex) {
+					DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZZ");
+					Date date = df.parse(randomDrawDate);
+					if(date == null) {
+						throw new IllegalArgumentException();
+					}
+					drawDate = new DateTime(date);
+				}
+        		  
         		  //We need the locale to localize the output string
         		  Locale loc = new ResourceLoader().getLocale();
         		  String drawDateString = DateTimeFormat.fullDate().withLocale(loc).print(drawDate);