diff --git a/typo3/sysext/core/Classes/Controller/FileDumpController.php b/typo3/sysext/core/Classes/Controller/FileDumpController.php
index 7dd268afa9322872c11cd088ccb2d5db9b196166..b8b5a78478e990c4251621cd8ff7d0e8e0c69bc0 100644
--- a/typo3/sysext/core/Classes/Controller/FileDumpController.php
+++ b/typo3/sysext/core/Classes/Controller/FileDumpController.php
@@ -57,13 +57,17 @@ class FileDumpController
 
         if (GeneralUtility::hmac(implode('|', $parameters), 'resourceStorageDumpFile') === $this->getGetOrPost($request, 'token')) {
             if (isset($parameters['f'])) {
-                $file = ResourceFactory::getInstance()->getFileObject($parameters['f']);
-                if ($file->isDeleted() || $file->isMissing()) {
+                try {
+                    $file = ResourceFactory::getInstance()->getFileObject($parameters['f']);
+                    if ($file->isDeleted() || $file->isMissing()) {
+                        $file = null;
+                    }
+                } catch (\Exception $e) {
                     $file = null;
                 }
             } else {
                 $file = GeneralUtility::makeInstance(ProcessedFileRepository::class)->findByUid($parameters['p']);
-                if ($file->isDeleted()) {
+                if (!$file || $file->isDeleted()) {
                     $file = null;
                 }
             }