diff --git a/lib/Service/CacheActorService.php b/lib/Service/CacheActorService.php
index fe71341d..64585106 100644
--- a/lib/Service/CacheActorService.php
+++ b/lib/Service/CacheActorService.php
@@ -135,11 +135,15 @@ class CacheActorService {
 
 			/** @var Person $actor */
 			$actor = AP::$activityPub->getItemFromData($object);
+			if ($actor->getType() !== Person::TYPE) {
+				throw new InvalidResourceException();
+			}
+
 			if ($id !== $actor->getId()) {
 				throw new InvalidOriginException();
 			}
 
-			$actor->setAccount($actor->getPreferredUsername() . '@' . $this->get('_host', $object));
+			$actor->setAccount($actor->getPreferredUsername() . '@' . $this->get('_host', $info));
 			try {
 				$this->save($actor);
 			} catch (Exception $e) {
@@ -187,9 +191,7 @@ class CacheActorService {
 				throw new CacheActorDoesNotExistException();
 			}
 
-			$object = $this->curlService->retrieveAccount($account);
-			/** @var Person $actor */
-			$actor = AP::$activityPub->getItemFromData($object);
+			$actor = $this->curlService->retrieveAccount($account);
 			$actor->setAccount($account);
 			try {
 				$this->save($actor);
diff --git a/lib/Service/CurlService.php b/lib/Service/CurlService.php
index d674aa3b..ee9e5082 100644
--- a/lib/Service/CurlService.php
+++ b/lib/Service/CurlService.php
@@ -79,7 +79,7 @@ class CurlService {
 	/**
 	 * @param string $account
 	 *
-	 * @return mixed
+	 * @return Person
 	 * @throws InvalidResourceException
 	 * @throws MalformedArrayException
 	 * @throws Request410Exception
@@ -89,7 +89,7 @@ class CurlService {
 	 * @throws UnknownItemException
 	 * @throws InvalidOriginException
 	 */
-	public function retrieveAccount(string $account) {
+	public function retrieveAccount(string $account): Person {
 		$account = $this->withoutBeginAt($account);
 
 		if (strstr(substr($account, 0, -3), '@') === false) {
@@ -112,28 +112,33 @@ class CurlService {
 			throw new RequestException();
 		}
 
-		$data = $this->retrieveObject($this->get('href', $link, ''));
-		$object = AP::$activityPub->getItemFromData($data);
+		$id = $this->get('href', $link, '');
+		$data = $this->retrieveObject($id);
 
-		if ($object->getType() === Person::TYPE) {
-			return $object;
+		/** @var Person $actor */
+		$actor = AP::$activityPub->getItemFromData($data);
+		if ($actor->getType() !== Person::TYPE) {
+			throw new UnknownItemException();
 		}
 
-		$object->checkOrigin($object->getId());
+		if ($actor->getId() !== $id) {
+			throw new InvalidOriginException();
+		}
 
-		throw new UnknownItemException();
+		return $actor;
 	}
 
 
 	/**
 	 * @param $id
 	 *
-	 * @return mixed
-	 * @throws RequestException
-	 * @throws Request410Exception
+	 * @return array
 	 * @throws MalformedArrayException
+	 * @throws Request410Exception
+	 * @throws RequestException
 	 */
-	public function retrieveObject($id) {
+	public function retrieveObject($id): array {
+
 		$url = parse_url($id);
 		$this->mustContains(['path', 'host'], $url);
 		$request = new Request($url['path'], Request::TYPE_GET);