diff --git a/src/Model/ItemURI.php b/src/Model/ItemURI.php
index b51ebcb08..020c468d2 100644
--- a/src/Model/ItemURI.php
+++ b/src/Model/ItemURI.php
@@ -65,6 +65,10 @@ class ItemURI
 	 */
 	public static function getIdByURI(string $uri): int
 	{
+		if (empty($uri)) {
+			return 0;
+		}
+
 		// If the URI gets too long we only take the first parts and hope for best
 		$uri = substr($uri, 0, 255);
 
diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index b2a815c83..77515b149 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -321,7 +321,7 @@ class Photo
 	 * @param string  $filename  Filename
 	 * @param string  $album     Album name
 	 * @param integer $scale     Scale
-	 * @param integer $type      Photo type
+	 * @param integer $type      Photo type, optional, default: Photo::DEFAULT
 	 * @param string  $allow_cid Permissions, allowed contacts. optional, default = ""
 	 * @param string  $allow_gid Permissions, allowed groups. optional, default = ""
 	 * @param string  $deny_cid  Permissions, denied contacts.optional, default = ""
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index c2333004f..eab23222c 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -1216,7 +1216,7 @@ class Processor
 		}
 
 		$replyto = JsonLD::fetchElement($activity['as:object'], 'as:inReplyTo', '@id');
-		$uriid = ItemURI::getIdByURI($replyto);
+		$uriid = ItemURI::getIdByURI($replyto ?? '');
 		if (Post::exists(['uri-id' => $uriid])) {
 			Logger::info('Post is a reply to an existing post - accepted', ['id' => $id, 'uri-id' => $uriid, 'replyto' => $replyto]);
 			return true;