diff --git a/module/Rest/config/routes.config.php b/module/Rest/config/routes.config.php
index 709b363b..92783726 100644
--- a/module/Rest/config/routes.config.php
+++ b/module/Rest/config/routes.config.php
@@ -1,7 +1,6 @@
 <?php
 declare(strict_types=1);
 
-use Fig\Http\Message\RequestMethodInterface as RequestMethod;
 use Shlinkio\Shlink\Rest\Action;
 
 return [
diff --git a/module/Rest/src/Action/ShortCode/AbstractCreateShortCodeAction.php b/module/Rest/src/Action/ShortCode/AbstractCreateShortCodeAction.php
index 3bbc15bb..33978675 100644
--- a/module/Rest/src/Action/ShortCode/AbstractCreateShortCodeAction.php
+++ b/module/Rest/src/Action/ShortCode/AbstractCreateShortCodeAction.php
@@ -57,7 +57,15 @@ abstract class AbstractCreateShortCodeAction extends AbstractRestAction
             $shortCodeMeta = $shortCodeData->getMeta();
             $longUrl = $shortCodeData->getLongUrl();
             $customSlug = $shortCodeMeta->getCustomSlug();
+        } catch (ValidationException | InvalidArgumentException $e) {
+            $this->logger->warning('Provided data is invalid.' . PHP_EOL . $e);
+            return new JsonResponse([
+                'error' => RestUtils::INVALID_ARGUMENT_ERROR,
+                'message' => $this->translator->translate('Provided data is invalid'),
+            ], self::STATUS_BAD_REQUEST);
+        }
 
+        try {
             $shortCode = $this->urlShortener->urlToShortCode(
                 $longUrl,
                 $shortCodeData->getTags(),
@@ -94,12 +102,6 @@ abstract class AbstractCreateShortCodeAction extends AbstractRestAction
                     $customSlug
                 ),
             ], self::STATUS_BAD_REQUEST);
-        } catch (ValidationException | InvalidArgumentException $e) {
-            $this->logger->warning('Provided data is invalid.' . PHP_EOL . $e);
-            return new JsonResponse([
-                'error' => RestUtils::INVALID_ARGUMENT_ERROR,
-                'message' => $this->translator->translate('Provided data is invalid'),
-            ], self::STATUS_BAD_REQUEST);
         } catch (\Throwable $e) {
             $this->logger->error('Unexpected error creating shortcode.' . PHP_EOL . $e);
             return new JsonResponse([