Merge remote-tracking branch 'upstream/2020.12-rc' into notices

src/Factory/Api/Mastodon/Account.php

@@ -67,6 +67,10 @@ class Account extends BaseFactory
 			$userContact = [];
 		}
 
+		if (empty($publicContact)) {
+			throw new HTTPException\NotFoundException('Contact ' . $contactId . ' not found');
+		}
+
 		$apcontact = APContact::getByURL($publicContact['url'], false);
 
 		$self_contact = Contact::selectFirst(['uid'], ['nurl' => $publicContact['nurl'], 'self' => true]);