=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java	2014-06-06 09:06:24 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java	2014-06-06 10:19:36 +0000
@@ -509,6 +509,11 @@
      */
     public static Date parseDate( final String dateString )
     {
+        if ( dateString == null )
+        {
+            return null;
+        }
+
         SimpleDateFormat[] supportedDateFormats = new SimpleDateFormat[]{
             new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ssZ" ),
             new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ss" ),
@@ -529,6 +534,7 @@
             {
             }
         }
+
         return null;
     }
 }