=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm	2009-12-23 07:35:17 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm	2010-01-28 18:15:01 +0000
@@ -40,10 +40,12 @@
 			<br><br>
 			<h4>$i18n.getString( "followup" )</h4>
 			
-		    #if ( $dataValue.isFollowup() )
+		    #if ( $dataValue && $dataValue.isFollowup() )
                 <img id="followup" src="../images/marked_large.png" alt="$i18n.getString( 'mark_value_for_followup' )" onclick="markValueForFollowup( '$dataValue.dataElement.id', '$dataValue.period.id', '$dataValue.source.id', '$dataValue.optionCombo.id' )" style="cursor:pointer">
-			#else
+			#elseif ( $dataValue )
                 <img id="followup" src="../images/unmarked_large.png" alt="$i18n.getString( 'unmark_value_for_followup' )" onclick="markValueForFollowup( '$dataValue.dataElement.id', '$dataValue.period.id', '$dataValue.source.id', '$dataValue.optionCombo.id' )" style="cursor:pointer">
+			#else
+			    <img id="followup" src="../images/unmarked_large.png">
 			#end
 		</td>
 		<!-- Column 2 - Min-max -->