diff --git a/.gitignore b/.gitignore
index 8ef0139ea..172413437 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
 .idea
 .vscode
 bower.json
+
+*.swp
diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
index 0057dd92a..61796c6eb 100755
--- a/src/scales/scale.time.js
+++ b/src/scales/scale.time.js
@@ -360,9 +360,10 @@ module.exports = function(Chart) {
 		getLabelForIndex: function(index, datasetIndex) {
 			var me = this;
 			var label = me.chart.data.labels && index < me.chart.data.labels.length ? me.chart.data.labels[index] : '';
+			var value = me.chart.data.datasets[datasetIndex].data[index];
 
-			if (typeof me.chart.data.datasets[datasetIndex].data[0] === 'object') {
-				label = me.getRightValue(me.chart.data.datasets[datasetIndex].data[index]);
+			if (value !== null && typeof value === 'object') {
+				label = me.getRightValue(value);
 			}
 
 			// Format nicely
diff --git a/test/scale.time.tests.js b/test/scale.time.tests.js
index 896ff00d4..d3d5d7b7f 100755
--- a/test/scale.time.tests.js
+++ b/test/scale.time.tests.js
@@ -428,7 +428,7 @@ describe('Time scale tests', function() {
 				datasets: [{
 					xAxisID: 'xScale0',
 					yAxisID: 'yScale0',
-					data: []
+					data: [null, 10, 3]
 				}],
 				labels: ['2015-01-01T20:00:00', '2015-01-02T21:00:00', '2015-01-03T22:00:00', '2015-01-05T23:00:00', '2015-01-07T03:00', '2015-01-08T10:00', '2015-01-10T12:00'], // days
 			},
@@ -449,6 +449,7 @@ describe('Time scale tests', function() {
 		});
 
 		var xScale = chart.scales.xScale0;
+		expect(xScale.getLabelForIndex(0, 0)).toBeTruthy();
 		expect(xScale.getLabelForIndex(0, 0)).toBe('2015-01-01T20:00:00');
 		expect(xScale.getLabelForIndex(6, 0)).toBe('2015-01-10T12:00');
 	});