Index: json_server.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/json_server/json_server.module,v
retrieving revision 1.8.4.2
diff -u -p -r1.8.4.2 json_server.module
--- json_server.module	4 May 2010 20:00:36 -0000	1.8.4.2
+++ json_server.module	29 Jun 2010 06:56:43 -0000
@@ -34,12 +34,12 @@ function json_server_server() {
 if (!isset($_POST)) {
   return drupal_to_js(array('#error' => TRUE, '#data' => "JSON server accepts POST requests only."));
 }
-  
+
   $methods = services_get_all();
   services_strip_hashes($methods);
   $request = drupal_parse_json($_POST['method']);
   $args = array();
-  
+
   foreach ($methods as $method) {
     if ($method['method'] == $request) {
       unset($_POST['q']);
@@ -57,16 +57,17 @@ if (!isset($_POST)) {
         }
       }
       $result = services_method_call($method['method'], $args);
-      if (is_array($result) && $result['error'] === TRUE)
-        return drupal_to_js(array('#error' => TRUE, '#data' => $result['message']));
-      
+      if (is_array($result) && $result['#error'] === TRUE) {
+        return drupal_to_js(array('#error' => TRUE, '#data' => $result['#message']));
+      }
+
       return drupal_to_js(array('#error' => FALSE, '#data' => $result));
     }
   }
 
   return drupal_to_js(array('#error' => TRUE, '#data' => "Invalid method $request"));
 }
-      
+
 
 /**
  *  Load the needed assets to run the server via js.