diff --git a/Classes/AssetSource/CantoAssetProxyQuery.php b/Classes/AssetSource/CantoAssetProxyQuery.php
index 33753aa..c6f794d 100644
--- a/Classes/AssetSource/CantoAssetProxyQuery.php
+++ b/Classes/AssetSource/CantoAssetProxyQuery.php
@@ -260,8 +260,6 @@ public function getArrayResult(): array
      * @param int $limit
      * @param array $orderings
      * @return Response
-     * @throws AuthenticationFailedException
-     * @throws IdentityProviderException
      * @throws OAuthClientException
      * @throws GuzzleException
      */
@@ -296,8 +294,6 @@ private function sendSearchRequest(int $limit, array $orderings): Response
 
     /**
      * @return void
-     * @throws AuthenticationFailedException
-     * @throws IdentityProviderException
      * @throws OAuthClientException
      * @throws GuzzleException
      */
@@ -331,8 +327,6 @@ public function prepareTagQuery(): void
 
     /**
      * @return void
-     * @throws AuthenticationFailedException
-     * @throws IdentityProviderException
      * @throws OAuthClientException
      * @throws GuzzleException
      */
diff --git a/Classes/AssetSource/CantoAssetProxyRepository.php b/Classes/AssetSource/CantoAssetProxyRepository.php
index a11e25a..01cff3d 100644
--- a/Classes/AssetSource/CantoAssetProxyRepository.php
+++ b/Classes/AssetSource/CantoAssetProxyRepository.php
@@ -66,7 +66,6 @@ public function __construct(CantoAssetSource $assetSource)
      * @return AssetProxyInterface
      * @throws AssetNotFoundExceptionInterface
      * @throws AssetSourceConnectionExceptionInterface
-     * @throws AuthenticationFailedException
      * @throws AssetNotFoundException
      * @throws Exception
      */
diff --git a/Classes/AssetSource/CantoAssetSource.php b/Classes/AssetSource/CantoAssetSource.php
index 2419ac2..09558bd 100644
--- a/Classes/AssetSource/CantoAssetSource.php
+++ b/Classes/AssetSource/CantoAssetSource.php
@@ -192,6 +192,7 @@ public function getAssetProxyRepository(): AssetProxyRepositoryInterface
 
     /**
      * @return bool
+     * @todo Change back to true, because we do not write to Canto!
      */
     public function isReadOnly(): bool
     {
@@ -238,7 +239,7 @@ public function getDescription(): string
         return $this->description;
     }
 
-    public function getApiBaseUri()
+    public function getApiBaseUri(): string
     {
         return $this->apiBaseUri;
     }
@@ -255,8 +256,6 @@ public function getAppSecret(): string
 
     /**
      * @return CantoClient
-     * @throws AuthenticationFailedException
-     * @throws IdentityProviderException
      */
     public function getCantoClient(): CantoClient
     {
diff --git a/Classes/Command/CantoCommandController.php b/Classes/Command/CantoCommandController.php
index 82a7979..6caa57d 100644
--- a/Classes/Command/CantoCommandController.php
+++ b/Classes/Command/CantoCommandController.php
@@ -69,19 +69,20 @@ public function tagUsedAssetsCommand(string $assetSource = CantoAssetSource::ASS
         !$quiet && $this->outputLine('<b>Tagging used assets of asset source "%s" via Canto API:</b>', [$assetSourceIdentifier]);
 
         try {
+            /** @var CantoAssetSource $cantoAssetSource */
             $cantoAssetSource = $this->assetSourceService->getAssetSources()[$assetSourceIdentifier];
             $cantoClient = $cantoAssetSource->getCantoClient();
         } catch (MissingClientSecretException $e) {
             $this->outputLine('<error>Authentication error: Missing client secret</error>');
-            exit(1);
+            $this->quit(1);
         } catch (AuthenticationFailedException $e) {
             $this->outputLine('<error>Authentication error: %s</error>', [$e->getMessage()]);
-            exit(1);
+            $this->quit(1);
         }
 
         if (!$cantoAssetSource->isAutoTaggingEnabled()) {
             $this->outputLine('<error>Auto-tagging is disabled</error>');
-            exit(1);
+            $this->quit(1);
         }
 
         $assetProxyRepository = $cantoAssetSource->getAssetProxyRepository();