tweaking error handling (again)

Author: robocoder

lib/WebDriver/AbstractWebDriver.php

@@ -157,18 +157,12 @@ protected function curl($requestMethod, $command, $parameters = null, $extraOpti
             );
         }
 
-        $value   = $this->offsetGet('value', $result);
-        $message = $this->offsetGet('message', $result);
-        $error   = $this->offsetGet('error', $result);
+        $value = $this->offsetGet('value', $result);
 
-        if ($message === null) {
+        if (($message = $this->offsetGet('message', $result)) === null) {
             $message = $this->offsetGet('message', $value);
         }
 
-        if ($error === null) {
-            $error = $this->offsetGet('error', $value);
-        }
-
         // if not success, throw exception
         if (isset($result['status']) && (int) $result['status'] !== 0) {
             throw WebDriverException::factory(
@@ -177,6 +171,10 @@ protected function curl($requestMethod, $command, $parameters = null, $extraOpti
             );
         }
 
+        if (($error = $this->offsetGet('error', $result)) === null) {
+            $error = $this->offsetGet('error', $value);
+        }
+
         if (isset($error)) {
             throw WebDriverException::factory(
                 $error,