diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index dae783bd74..6dd918c4c6 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -855,6 +855,9 @@ class Transmitter
 	public static function createActivityFromMail($mail_id, $object_mode = false)
 	{
 		$mail = self::ItemArrayFromMail($mail_id);
+		if (empty($mail)) {
+			return [];
+		}
 		$object = self::createNote($mail);
 
 		if (!$object_mode) {
diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 90bb2455b5..e73ded0256 100644
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -563,7 +563,7 @@ class Feed
 				$data_text = strip_tags(trim($data['text'] ?? ''));
 				$item_body = strip_tags(trim($item['body'] ?? ''));
 
-				if (($data_text == $item_body) || strstr($item_body, $data_text)) {
+				if (!empty($data_text) && (($data_text == $item_body) || strstr($item_body, $data_text))) {
 					$data['text'] = '';
 				}
 
diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php
index a896440a97..7771712f31 100644
--- a/src/Util/ExAuth.php
+++ b/src/Util/ExAuth.php
@@ -39,6 +39,7 @@ use Friendica\App;
 use Friendica\Core\Config\IConfig;
 use Friendica\Core\PConfig\IPConfig;
 use Friendica\Database\Database;
+use Friendica\DI;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException;