=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2013-09-06 07:54:55 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2013-09-09 14:47:21 +0000
@@ -579,11 +579,14 @@
 
             PatientComment comment = programStageInstance.getPatientComment();
 
-            grid.addRow();
-            grid.addValue( i18n.getString( "comment" ) + " " + i18n.getString( "on" ) + " "
-                + format.formatDateTime( comment.getCreatedDate() ) );
-            grid.addValue( comment.getCommentText() );
-
+            if ( comment != null )
+            {
+                grid.addRow();
+                grid.addValue( i18n.getString( "comment" ) + " " + i18n.getString( "on" ) + " "
+                    + format.formatDateTime( comment.getCreatedDate() ) );
+                grid.addValue( comment.getCommentText() );
+            }
+            
             // SMS messages
 
             List<OutboundSms> messasges = programStageInstance.getOutboundSms();