diff --git a/src/scales/scale.linear.js b/src/scales/scale.linear.js
index c9827e02ef0..642ea0c4969 100644
--- a/src/scales/scale.linear.js
+++ b/src/scales/scale.linear.js
@@ -157,7 +157,7 @@
 		},
 		// Get the correct value. If the value type is object get the x or y based on whether we are horizontal or not
 		getRightValue: function(rawValue) {
-			return typeof rawValue === "object" ? (this.isHorizontal() ? rawValue.x : rawValue.y) : rawValue;
+			return typeof (rawValue === "object" && rawValue !== null) ? (this.isHorizontal() ? rawValue.x : rawValue.y) : rawValue;
 		},
 		getPixelForValue: function(value) {
 			// This must be called after fit has been run so that