diff --git a/xero.module b/xero.module
index dbf2b21..e4089d9 100644
--- a/xero.module
+++ b/xero.module
@@ -228,7 +228,7 @@ function xero_query($type = 'get', $action, $id = FALSE, $after = FALSE, $items
   }
 
   if (isset($result['ErrorNumber'])) {
-    xero_error($result['ErrorNumber'], $result['Type'], $result['Message']);
+    xero_error($result['ErrorNumber'], $result['Type'], $result['Message'] . "\n\nItems: " . print_r($items, true) . "\n\nResult: " . print_r($result, true));
   }
 
   return $result;
@@ -242,7 +242,7 @@ function xero_query($type = 'get', $action, $id = FALSE, $after = FALSE, $items
  */
 function xero_error($code = 0, $type = '', $message) {
   $error_code = (!empty($type)) ? $code . ' ' . $type : $code;
-  $formatted = t('<b>Error</b>: %code: %message', array('%code' => $error_code, '%message' => $message ));
+  $formatted = t('<b>Error</b>: %code: <pre>@message</pre>', array('%code' => $error_code, '@message' => $message ));
   drupal_set_message($formatted, 'error');
   watchdog('xero', $formatted, NULL, WATCHDOG_CRITICAL, NULL);
 }