diff --git a/includes/services.runtime.inc b/includes/services.runtime.inc
index 249226d..18cd24c 100644
--- a/includes/services.runtime.inc
+++ b/includes/services.runtime.inc
@@ -28,7 +28,7 @@ class ServicesException extends Exception {
   public function __construct($message, $code = 0, $data = NULL) {
     parent::__construct($message, $code);
 
-    $this->data = $message;
+    $this->data = !empty($data) ? $data : $message;
   }
 
   /**