diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index 133801150..02fa87ce6 100644
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -315,10 +315,13 @@
 		isHorizontal: function() {
 			return this.options.position == "top" || this.options.position == "bottom";
 		},
-		
-		// Get the correct value. If the value type is object get the x or y based on whether we are horizontal or not
+
+		// Get the correct value. NaN bad inputs, 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" && rawValue !== null) ? (this.isHorizontal() ? rawValue.x : rawValue.y) : rawValue;
+			if (isNaN(rawValue) || rawValue === null || typeof(rawValue) === 'undefined') {
+				return NaN;
+			}
+			return typeof(rawValue) === "object" ? (this.isHorizontal() ? rawValue.x : rawValue.y) : rawValue;
 		},
 
 		// Used to get the value to display in the tooltip for the data at the given index