=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/SaveDataEntryFormAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/SaveDataEntryFormAction.java 2012-06-04 16:20:41 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/SaveDataEntryFormAction.java 2012-06-07 13:45:42 +0000 @@ -104,7 +104,8 @@ DataEntryForm form = dataset.getDataEntryForm(); - if ( ( form != null && form.getStyle() != null && !form.getStyle().equals( style ) ) || + if ( form == null || form.getHtmlCode() == null || + ( form != null && form.getStyle() != null && !form.getStyle().equals( style ) ) || ( form != null && form.getHtmlCode() != null && !form.getHtmlCode().equals( designTextarea ) ) ) { dataset.increaseVersion(); // Check if version must be updated