=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js	2015-01-13 17:48:51 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js	2015-01-14 08:53:47 +0000
@@ -355,7 +355,7 @@
 
             for (i = 0; i < ln; i++) {
                 point = inflections[i];
-                text = me.label.renderer(labels[i]);
+                text = me.label.renderer(labels[i]) || '';
                 textLabel = me.getOrCreateLabel(i, text);
                 bbox = textLabel._bbox;
                 maxHeight = max(maxHeight, bbox.height + me.dashSize + me.label.padding);

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js	2015-01-13 17:57:47 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js	2015-01-14 08:53:47 +0000
@@ -355,7 +355,7 @@
 
             for (i = 0; i < ln; i++) {
                 point = inflections[i];
-                text = me.label.renderer(labels[i]);
+                text = me.label.renderer(labels[i]) || '';
                 textLabel = me.getOrCreateLabel(i, text);
                 bbox = textLabel._bbox;
                 maxHeight = max(maxHeight, bbox.height + me.dashSize + me.label.padding);