Check for existence of data element before accessing property

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index 4794cf80a6716982c9f932963604a4e20c048782..398d40d2b389e6ee019ef57b8fe41dfbc9a2c2c5 100644 (file)
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -413,9 +413,10 @@ module.exports = function(Chart) {
 
                        helpers.each(me.data.datasets, function(dataset, datasetIndex) {
                                if (me.isDatasetVisible(datasetIndex)) {
-                                       var meta = me.getDatasetMeta(datasetIndex);
-                                       if(!meta.data[found._index]._view.skip){
-                                               elementsArray.push(meta.data[found._index]);
+                                       var meta = me.getDatasetMeta(datasetIndex),
+                                               element = meta.data[found._index];
+                                       if(element && !element._view.skip){
+                                               elementsArray.push(element);
                                        }
                                }
                        }, me);