diff --git a/WebDriver.php b/WebDriver.php
index 43a35c4..9d6cf41 100644
--- a/WebDriver.php
+++ b/WebDriver.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once 'WebDriver/Exception.php';
+
 class WebDriver {
   public static $ImplicitWaitMS = 0;
   
@@ -68,7 +70,7 @@ public static function __callStatic($name, $arguments) {
     if (isset(self::$keys[$name])) {
       return json_decode('"' . self::$keys[$name] . '"');
     } else {
-      throw new Exception("Can't type key $name");
+      throw new WebDriver_Exception("Can't type key $name");
     }
   }
 
@@ -131,7 +133,7 @@ public static function ParseLocator($locator) {
         $strategy = "xpath";
         $value = $locator;
       } else if (substr($locator, 0, 9) === "document." || substr($locator, 0, 4) === "dom=") {
-        throw new Exception("DOM selectors aren't supported in WebDriver: $locator");
+        throw new WebDriver_Exception("DOM selectors aren't supported in WebDriver: $locator");
       } else { // Fall back to id
         $strategy = "id";
         $value = $locator;
@@ -148,7 +150,7 @@ public static function QuoteXPath($value) {
     } else if (!$contains_double_quote) {
       return '"' . $value . '"';
     } else {
-      $parts = split("'", $value);
+      $parts = preg_split("/'/", $value);
       return "concat('" . implode("', \"'\", '", $parts) . "')";
     }
   }
@@ -175,6 +177,7 @@ public static function CanonicalizeCSSColor($color) {
       'teal' => '008080',
       'aqua' => '00FFFF',
     );
+    $six_hex = null;
     if (preg_match('/^rgb\(([0-9]+),\s*([0-9]+),\s*([0-9]+)\)$/', $color, $rgb)) {
       // rgb(255, 255, 255) -> ffffff
       if (0 <= $rgb[1] && $rgb[1] <= 255 && 0 <= $rgb[2] && $rgb[2] <= 255 && 0 <= $rgb[3] && $rgb[3] <= 255) {
diff --git a/WebDriver/Exception.php b/WebDriver/Exception.php
new file mode 100644
index 0000000..ee5687b
--- /dev/null
+++ b/WebDriver/Exception.php
@@ -0,0 +1,5 @@
+<?php
+
+class WebDriver_Exception extends Exception
+{
+}
diff --git a/WebDriverColorTest.php b/WebDriverColorTest.php
index 0c93a31..2920a8d 100644
--- a/WebDriverColorTest.php
+++ b/WebDriverColorTest.php
@@ -39,7 +39,7 @@ public function invalid_colors() {
   
   /**
    * @dataProvider invalid_colors
-   * @expectedException Exception
+   * @expectedException PHPUnit_Framework_ExpectationFailedException
    */
   public function test_invalid_colors($input) {
     WebDriver::CanonicalizeCSSColor($input);
diff --git a/WebDriverSelectorTest.php b/WebDriverSelectorTest.php
index b51089f..da7a484 100644
--- a/WebDriverSelectorTest.php
+++ b/WebDriverSelectorTest.php
@@ -62,7 +62,7 @@ public function invalid_selectors() {
   
   /**
    * @dataProvider invalid_selectors
-   * @expectedException Exception
+   * @expectedException WebDriver_Exception
    */
   public function test_invalid_selectors($input) {
     WebDriver::ParseLocator($input);
diff --git a/WebDriverXPathTest.php b/WebDriverXPathTest.php
index 85b0fec..009d8d9 100644
--- a/WebDriverXPathTest.php
+++ b/WebDriverXPathTest.php
@@ -20,7 +20,7 @@ public function data() {
 consecutive""""quotes
 consecutive'"'"'mixedquotes
 EOT;
-    $test_data = split("\n", $strings);
+    $test_data = preg_split("/\n/", $strings);
     foreach ($test_data as &$data) {
       $data = array($data);
     }