diff --git a/src/Console/MergeContacts.php b/src/Console/MergeContacts.php
index 0d05c579fa..405622cc4b 100644
--- a/src/Console/MergeContacts.php
+++ b/src/Console/MergeContacts.php
@@ -87,7 +87,7 @@ HELP;
 	{
 		$first = $this->dba->selectFirst('contact', ['id', 'nurl', 'url'], ["`uri-id` = ? AND `nurl` != ? AND `url` != ?", $uriid, '', ''], ['order' => ['id']]);
 		if (empty($first)) {
-			$this->err($this->l10n->t('No valid first countact found for uri-id %d.', $uriid));
+			$this->err($this->l10n->t('No valid first contact found for uri-id %d.', $uriid));
 			return;
 		}
 		$this->out($first['url']);
diff --git a/src/Module/Special/HTTPException.php b/src/Module/Special/HTTPException.php
index 8b520f6b5a..0cd7817ed4 100644
--- a/src/Module/Special/HTTPException.php
+++ b/src/Module/Special/HTTPException.php
@@ -70,8 +70,17 @@ class HTTPException
 		$content = '';
 
 		if ($e->getCode() >= 400) {
-			$tpl = Renderer::getMarkupTemplate('http_status.tpl');
-			$content = Renderer::replaceMacros($tpl, self::getVars($e));
+			$vars = self::getVars($e);
+			try {
+				$tpl = Renderer::getMarkupTemplate('http_status.tpl');
+				$content = Renderer::replaceMacros($tpl, $vars);
+			} catch (\Exception $e) {
+				$content = "<h1>{$vars['$title']}</h1><p>{$vars['$message']}</p>";
+				if (DI::app()->isSiteAdmin()) {
+					$content .= "<p>{$vars['$thrown']}</p>";
+					$content .= "<pre>{$vars['$trace']}</pre>";
+				}
+			}
 		}
 
 		System::httpError($e->getCode(), $e->getDescription(), $content);
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index a8d51da43a..1f336b214d 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -226,7 +226,7 @@ class Processor
 	 */
 	public static function updateItem(array $activity)
 	{
-		$item = Post::selectFirst(['uri', 'uri-id', 'thr-parent', 'gravity', 'post-type'], ['uri' => $activity['id']]);
+		$item = Post::selectFirst(['uri', 'uri-id', 'thr-parent', 'gravity', 'post-type', 'private'], ['uri' => $activity['id']]);
 		if (!DBA::isResult($item)) {
 			Logger::warning('No existing item, item will be created', ['uri' => $activity['id']]);
 			$item = self::createItem($activity, false);
diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index cf29605f7e..b6a8c5b72a 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2022.09-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-08-01 12:24-0400\n"
+"POT-Creation-Date: 2022-08-05 15:51+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1656,7 +1656,7 @@ msgstr ""
 
 #: src/Console/MergeContacts.php:90
 #, php-format
-msgid "No valid first countact found for uri-id %d."
+msgid "No valid first contact found for uri-id %d."
 msgstr ""
 
 #: src/Console/MergeContacts.php:101