diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index b09c94a087..edfaa2a34b 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -705,7 +705,7 @@ class Diaspora
 		// This is something that shouldn't happen at all.
 		if (in_array($type, ['status_message', 'reshare', 'profile'])) {
 			if ($msg['author'] != $fields->author) {
-				Logger::notice('Message handle is not the same as envelope sender. Quitting this message.');
+				Logger::notice('Message handle is not the same as envelope sender. Quitting this message.', ['author1' => $msg['author'], 'author2' => $fields->author]);
 				return false;
 			}
 		}
@@ -760,7 +760,7 @@ class Diaspora
 	{
 		$handle = strval($handle);
 
-		Logger::notice('Fetching diaspora key for: ' . $handle);
+		Logger::notice('Fetching diaspora key', ['handle' => $handle, 'callstack' => System::callstack(20)]);
 
 		$fcontact = FContact::getByURL($handle);
 		if (!empty($fcontact['pubkey'])) {
diff --git a/src/Util/XML.php b/src/Util/XML.php
index e371ea3cd6..a6e6cd5bab 100644
--- a/src/Util/XML.php
+++ b/src/Util/XML.php
@@ -141,9 +141,9 @@ class XML
 	 * @param string        $elementname Name of the XML element of the target
 	 * @return void
 	 */
-	public static function copy(&$source, &$target, string $elementname)
+	public static function copy(&$source, &$target, $elementname)
 	{
-		if (is_string($source)) {
+		if (count($source->children()) == 0) {
 			$target->addChild($elementname, self::escape($source));
 		} else {
 			$child = $target->addChild($elementname);