diff --git a/core/lib/Drupal/Core/Routing/Router.php b/core/lib/Drupal/Core/Routing/Router.php
index 23d6ebb66fba18e40daae8d3ecd47d231e11a687..a49c051fa174c2889d497ad0c419bdbdba79add3 100644
--- a/core/lib/Drupal/Core/Routing/Router.php
+++ b/core/lib/Drupal/Core/Routing/Router.php
@@ -114,33 +114,25 @@ public function matchRequest(Request $request): array {
     $collection = $this->applyRouteFilters($collection, $request);
     $collection = $this->applyFitOrder($collection);
 
-    if ($ret = $this->matchCollection(rawurldecode($this->currentPath->getPath($request)), $collection)) {
-      return $this->applyRouteEnhancers($ret, $request);
-    }
-
-    throw 0 < count($this->allow)
-      ? new MethodNotAllowedException(array_unique($this->allow))
-      : new ResourceNotFoundException(sprintf('No routes found for "%s".', $this->currentPath->getPath()));
+    $ret = $this->matchCollection(rawurldecode($this->currentPath->getPath($request)), $collection);
+    return $this->applyRouteEnhancers($ret, $request);
   }
 
   /**
-   * Tries to match a URL with a set of routes.
-   *
-   * @param string $pathinfo
-   *   The path info to be parsed
-   * @param \Symfony\Component\Routing\RouteCollection $routes
-   *   The set of routes.
-   *
-   * @return array|null
-   *   An array of parameters. NULL when there is no match.
+   * {@inheritdoc}
    */
-  protected function matchCollection($pathinfo, RouteCollection $routes) {
+  protected function matchCollection($pathinfo, RouteCollection $routes): array {
     // Try a case-sensitive match.
     $match = $this->doMatchCollection($pathinfo, $routes, TRUE);
     // Try a case-insensitive match.
     if ($match === NULL && $routes->count() > 0) {
       $match = $this->doMatchCollection($pathinfo, $routes, FALSE);
     }
+    if ($match === NULL) {
+      throw 0 < count($this->allow)
+        ? new MethodNotAllowedException(array_unique($this->allow))
+        : new ResourceNotFoundException(sprintf('No routes found for "%s".', $this->currentPath->getPath()));
+    }
     return $match;
   }