diff --git a/src/services/Api.php b/src/services/Api.php
index c42bdb8..28ac519 100644
--- a/src/services/Api.php
+++ b/src/services/Api.php
@@ -111,12 +111,12 @@ public function fetchFieldDataByCantoId(string $cantoId): ?CantoFieldData
         }
 
         return new CantoFieldData([
-            'cantoId' => $responseBody['id'] ?: 0,
+            'cantoId' => $responseBody['id'],
             'cantoAlbumId' => 0,
             'cantoAssetData' => [$responseBody],
             'cantoAlbumData' => [
-                'id' => $responseBody['relatedAlbums'][0]['id'] ?: 0,
-                'name' => $responseBody['relatedAlbums'][0]['name'] ?: '',
+                'id' => $responseBody['relatedAlbums'][0]['id'],
+                'name' => $responseBody['relatedAlbums'][0]['name'],
             ],
         ]);
     }
@@ -166,6 +166,9 @@ public function paginatedAlbumRequest(array &$buffer, string $albumId, int $star
         if (isset($responseBody['status']) && $responseBody['status'] === 'error') {
             return false;
         }
+        if (!is_array($responseBody['results'])) {
+            return false;
+        }
         $buffer = array_merge($buffer, $responseBody['results']);
         if (count($buffer) < $responseBody['found']) {
             $this->paginatedAlbumRequest($buffer, $albumId, $start + self::MAX_ALBUM_REQUEST_ITEMS);