=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/FormUtils.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/FormUtils.java	2015-08-31 08:23:12 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/FormUtils.java	2015-09-07 02:24:53 +0000
@@ -202,11 +202,9 @@
     private static List<Field> inputFromProgramStageDataElements( List<ProgramStageDataElement> programStageDataElements )
     {
         List<DataElement> dataElements = new ArrayList<>();
-
-        for ( ProgramStageDataElement programStageDataElement : programStageDataElements )
-        {
-            dataElements.add( programStageDataElement.getDataElement() );
-        }
+        programStageDataElements.stream()
+            .filter( programStageDataElement -> programStageDataElement != null && programStageDataElement.getDataElement() != null )
+            .forEach( programStageDataElement -> dataElements.add( programStageDataElement.getDataElement() ) );
 
         return inputFromDataElements( dataElements, new ArrayList<>() );
     }