Index: ../lib/TYPO3/blankpackage-6.1.1/typo3/sysext/core/Classes/Resource/ResourceFactory.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- ../lib/TYPO3/blankpackage-6.1.1/typo3/sysext/core/Classes/Resource/ResourceFactory.php	(revision )
+++ ../lib/TYPO3/blankpackage-6.1.1/typo3/sysext/core/Classes/Resource/ResourceFactory.php	(revision )
@@ -361,7 +361,12 @@
 				$folderIdentifier = substr($parts[0], strlen(PATH_site));
 			}
 		}
+
+    try {
-		return $this->getStorageObject($storageUid)->getFolder($folderIdentifier);
+      return $this->getStorageObject($storageUid)->getFolder($folderIdentifier);
+    } catch (\TYPO3\CMS\Core\Resource\Exception\FolderDoesNotExistException $e) {
+      return NULL;
+    }
 	}
 
 	/**