diff --git a/classes/Distance.php b/classes/Distance.php
index 238d411..6870399 100644
--- a/classes/Distance.php
+++ b/classes/Distance.php
@@ -39,7 +39,7 @@ class Distance
 	{
 		$pieces = explode('to', strtolower($method));
 
-		if (count($pieces) == 2)
+		if (count($pieces) == 2 && $pieces[1])
 		{
 			return Distance::convertUnit($arguments[0], $pieces[0], $pieces[1]);
 		}
diff --git a/tests/classes/DistanceTest.php b/tests/classes/DistanceTest.php
index dd1ecfc..858690a 100644
--- a/tests/classes/DistanceTest.php
+++ b/tests/classes/DistanceTest.php
@@ -66,6 +66,11 @@ class DistanceTest extends PHPUnit_Framework_TestCase
 	{
 		$this->assertEquals(1765745.8326334, Distance::calculateDistance(27.947222, -82.458611, 40.67, -73.94, 'yards'), '', 0.2);
 	}
+
+	public function testNotEnoughUnits()
+	{
+		$this->assertFalse(Distance::milesTo(123));
+	}
 }
 
 ?>