diff --git a/extlib/XMPPHP/XMLStream.php b/extlib/XMPPHP/XMLStream.php
index d33411ec54..dbc4719e42 100644
--- a/extlib/XMPPHP/XMLStream.php
+++ b/extlib/XMPPHP/XMLStream.php
@@ -417,7 +417,12 @@ class XMPPHP_XMLStream {
 					}
 				}
 				$this->log->log("RECV: $buff",  XMPPHP_Log::LEVEL_VERBOSE);
-				xml_parse($this->parser, $buff, false);
+				$ok = xml_parse($this->parser, $buff, false);
+                if (!$ok) {
+                    $errcode = xml_get_error_code($this->parser);
+                    $errstr = xml_error_string($errcode);
+                    $this->log->log("XML ERROR: $errstr", XMPPHP_Log::LEVEL_VERBOSE);
+                }
 			} else {
 				# $updated == 0 means no changes during timeout.
 			}
@@ -671,7 +676,12 @@ class XMPPHP_XMLStream {
 			}
 		}
 		$this->log->log("RECV: $buff",  XMPPHP_Log::LEVEL_VERBOSE);
-		xml_parse($this->parser, $buff, false);
+		$ok = xml_parse($this->parser, $buff, false);
+		if (!$ok) {
+		    $errcode = xml_get_error_code($this->parser);
+		    $errstr = xml_error_string($errcode);
+		    $this->log->log("XML ERROR: $errstr", XMPPHP_Log::LEVEL_VERBOSE);
+		}
 	}
 
 	/**
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index cef9c4bd07..0c118c53d6 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -148,6 +148,7 @@ class XMPPDaemon extends Daemon
 
     function handle_message(&$pl)
     {
+        $this->log(LOG_DEBUG, "Received message: " . str_replace("\n", " ", var_export($pl, true)));
         $from = jabber_normalize_jid($pl['from']);
 
         if ($pl['type'] != 'chat') {