=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java	2015-04-15 16:48:14 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java	2015-04-17 10:47:58 +0000
@@ -297,7 +297,9 @@
             rowNumber++;
         }
         
-        for ( GridHeader header : grid.getVisibleHeaders() )
+        List<GridHeader> headers = ListUtils.subList( grid.getVisibleHeaders(), 0, JXL_MAX_COLS );
+        
+        for ( GridHeader header : headers )
         {
             sheet.addCell( new Label( columnIndex++, rowNumber, header.getColumn(), XLS_FORMAT_LABEL ) );
         }
@@ -308,7 +310,9 @@
         {
             columnIndex = 0;
 
-            for ( Object column : row )
+            List<Object> colums = ListUtils.subList( row, 0, JXL_MAX_COLS );
+            
+            for ( Object column : colums )
             {
                 if ( column != null && MathUtils.isNumeric( String.valueOf( column ) ) )
                 {
@@ -320,11 +324,6 @@
                     
                     sheet.addCell( new Label( columnIndex++, rowNumber, content, XLS_FORMAT_TEXT ) );
                 }
-                
-                if ( columnIndex >= JXL_MAX_COLS )
-                {
-                    break;
-                }
             }
 
             rowNumber++;