diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php
index ce82c9a469..8e0db6f31e 100644
--- a/lib/xmppqueuehandler.php
+++ b/lib/xmppqueuehandler.php
@@ -53,8 +53,8 @@ class XmppQueueHandler extends QueueHandler {
 		try {
 			$this->conn->processTime($timeout);
 		} catch (XMPPHP_Exception $e) {
-			$this->log(LOG_ERROR, "Got an XMPPHP_Exception: " . $e->getMessage());
-			exit(1);
+			$this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
+			die($e->getMessage());
 		}
 	}
 	
diff --git a/scripts/jabberqueuehandler.php b/scripts/jabberqueuehandler.php
index 24f818a0c5..59cdb94ad7 100755
--- a/scripts/jabberqueuehandler.php
+++ b/scripts/jabberqueuehandler.php
@@ -45,7 +45,7 @@ class JabberQueueHandler extends XmppQueueHandler {
 		try {
 			return jabber_broadcast_notice($notice);
 		} catch (XMPPHP_Exception $e) {
-			$this->log(LOG_ERROR, "Got an XMPPHP_Exception: " . $e->getMessage());
+			$this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
 			exit(1);
 		}
 	}
diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php
index dde6a3427d..b1ae1d581d 100755
--- a/scripts/publicqueuehandler.php
+++ b/scripts/publicqueuehandler.php
@@ -43,8 +43,8 @@ class PublicQueueHandler extends XmppQueueHandler {
 		try {
 			return jabber_public_notice($notice);
 		} catch (XMPPHP_Exception $e) {
-			$this->log(LOG_ERROR, "Got an XMPPHP_Exception: " . $e->getMessage());
-			exit(1);
+			$this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
+			die($e->getMessage());
 		}
 	}
 }