diff --git a/soap_server.module b/soap_server.module
index cd1b431..25c503c 100644
--- a/soap_server.module
+++ b/soap_server.module
@@ -106,7 +106,7 @@ function soap_server_server() {
     $server->handle();
   }
   catch (Exception $e) {
-    watchdog('soap_server', $e->getMessage(), NULL, 'error');
+    watchdog('soap_server', '!exception', array('!exception' => $e->getMessage()), WATCHDOG_ERROR);
   }
   exit;
 }
@@ -235,10 +235,10 @@ class ServicesSoapServer {
     }
     
     if ($endpoint->debug) {
-      watchdog('soap server', "METHOD_NAME:<pre>". print_r($method_name, TRUE)."</pre");
-      watchdog('soap server', "ENDPOINT:<pre>". print_r($endpoint, TRUE)."</pre");
-      watchdog('soap server', "ARGS:<pre>". print_r($args, TRUE)."</pre");
-      watchdog('soap server', "CONTROLLER:<pre>". print_r($controller, TRUE)."</pre");
+      watchdog('soap_server', "METHOD_NAME:<pre>!method</pre>", array('!method' => print_r($method_name, TRUE)), WATCHDOG_DEBUG);
+      watchdog('soap_server', "ENDPOINT:<pre>!endpoint</pre>", array('!endpoint' => print_r($endpoint, TRUE)), WATCHDOG_DEBUG);
+      watchdog('soap_server', "ARGS:<pre>!args</pre>", array('!args' => print_r($args, TRUE)), WATCHDOG_DEBUG);
+      watchdog('soap_server', "CONTROLLER:<pre>!controller</pre>", array('!controller' => print_r($controller, TRUE)), WATCHDOG_DEBUG);
     }
     try {
       $ret = services_controller_execute($controller, $args);
@@ -246,7 +246,7 @@ class ServicesSoapServer {
     catch (Exception $e) {
       $code = $e->getCode();
       $soap_fault = new SoapFault($e->getMessage(), $code);
-      watchdog('soap_server', $e->getMessage(), NULL, 'error');
+      watchdog('soap_server', '!exception', array('!exception' => $e->getMessage()), WATCHDOG_ERROR);
       throw $soap_fault;
     }
     return $ret;
@@ -308,7 +308,7 @@ function soap_server_debug_client($endpoint, $node) {
   	'node' => $node,
   );
   if (empty($endpoint)) {
-    watchdog('soap_server', 'no endpoint obj in debug client', 'error');
+    watchdog('soap_server', 'no endpoint obj in debug client', array(), WATCHDOG_ERROR);
     return 'fail - no endpoint obj in debug client';
   }
   ini_set("soap.wsdl_cache_enabled", "0"); // disabling WSDL cache