=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js	2015-10-08 13:59:37 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js	2015-10-15 14:25:38 +0000
@@ -1029,14 +1029,14 @@
                     else if(effect.action === "SHOWERROR" && effect.dataElement.id){
                         var dialogOptions = {
                             headerText: 'validation_error',
-                            bodyText: effect.content + effect.data
+                            bodyText: effect.content + (effect.data ? effect.data : "")
                         };
                         DialogService.showDialog({}, dialogOptions);
             
                         $scope.currentEvent[effect.dataElement.id] = $scope.currentEventOriginialValue[effect.dataElement.id];
                     }
                     else if(effect.action === "SHOWWARNING"){
-                        $scope.warningMessages.push(effect.content + effect.data);
+                        $scope.warningMessages.push(effect.content + (effect.data ? effect.data : ""));
                     }
                     else if (effect.action === "ASSIGNVARIABLE") {
                         

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2015-10-08 13:59:37 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2015-10-15 14:25:38 +0000
@@ -126,7 +126,7 @@
                     if (effect.dataElement) {
                         
                         if(effect.ineffect) {
-                            $scope.errorMessages[effect.dataElement.id] = effect.content + effect.data;
+                            $scope.errorMessages[effect.dataElement.id] = effect.content + (effect.data ? effect.data : "");
                         } else {
                             $scope.errorMessages[effect.dataElement.id] = false;
                         }
@@ -137,7 +137,7 @@
                 } else if (effect.action === "SHOWWARNING") {
                     if (effect.dataElement) {
                         if(effect.ineffect) {
-                            $scope.warningMessages[effect.dataElement.id] = effect.content + effect.data;
+                            $scope.warningMessages[effect.dataElement.id] = effect.content + (effect.data ? effect.data : "");
                         } else {
                             $scope.warningMessages[effect.dataElement.id] = false;
                         }

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js	2015-10-13 16:33:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js	2015-10-15 14:25:38 +0000
@@ -286,7 +286,7 @@
                         if(effect.ineffect) {
                             var dialogOptions = {
                                 headerText: 'validation_error',
-                                bodyText: effect.content + effect.data
+                                bodyText: effect.content + (effect.data ? effect.data : "")
                             };
                             DialogService.showDialog({}, dialogOptions);
                             $scope.selectedTei[effect.trackedEntityAttribute.id] = $scope.tei[effect.trackedEntityAttribute.id];
@@ -298,7 +298,7 @@
                 } else if (effect.action === "SHOWWARNING") {
                     if (effect.trackedEntityAttribute) {
                         if(effect.ineffect) {
-                            $scope.warningMessages.push(effect.content + effect.data);
+                            $scope.warningMessages.push(effect.content + (effect.data ? effect.data : ""));
                         }
                     }
                     else {