diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index efaa7cd493..0a97c11c13 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -369,6 +369,8 @@ class Worker
 		// For this reason the variables have to be initialized.
 		$a->getProfiler()->reset();
 
+		$a->queue = $queue;
+
 		$up_duration = microtime(true) - self::$up_start;
 
 		// Reset global data to avoid interferences
diff --git a/src/Object/Post.php b/src/Object/Post.php
index fbe6970e29..e24607a787 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -808,7 +808,7 @@ class Post extends BaseObject
 
 		foreach ($terms as $term) {
 			$profile = Contact::getDetailsByURL($term['url']);
-			if (($profile['contact-type'] != Contact::TYPE_COMMUNITY) &&
+			if (!empty($profile['addr']) && !empty($profile['contact-type']) && ($profile['contact-type'] != Contact::TYPE_COMMUNITY) &&
 				($profile['addr'] != $owner['addr']) && !strstr($text, $profile['addr'])) {
 				$text .= '@' . $profile['addr'] . ' ';
 			}