7 files changed, 15 insertions, 1 deletions
diff --git a/apps/files_trashbin/l10n/fil.js b/apps/files_trashbin/l10n/fil.js
new file mode 100644
index 00000000000..0c880cc3be4
--- /dev/null
+++ b/apps/files_trashbin/l10n/fil.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Error" : "Error"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_trashbin/l10n/fil.json b/apps/files_trashbin/l10n/fil.json
new file mode 100644
index 00000000000..66c3d76a730
--- /dev/null
+++ b/apps/files_trashbin/l10n/fil.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Error" : "Error"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
+\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/hy.js b/apps/files_trashbin/l10n/hy.js
index 39e49b47ae1..b5f14a21117 100644
--- a/apps/files_trashbin/l10n/hy.js
+++ b/apps/files_trashbin/l10n/hy.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "files_trashbin",
     {
+    "Couldn't restore %s" : "Չկարողացա վերականգնել %s",
     "Deleted files" : "Ջնջված ֆայլեր",
     "Restore" : "Վերականգնել",
     "Delete" : "Ջնջել",
diff --git a/apps/files_trashbin/l10n/hy.json b/apps/files_trashbin/l10n/hy.json
index 4bd34056b3f..4cdf8121c67 100644
--- a/apps/files_trashbin/l10n/hy.json
+++ b/apps/files_trashbin/l10n/hy.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Couldn't restore %s" : "Չկարողացա վերականգնել %s",
     "Deleted files" : "Ջնջված ֆայլեր",
     "Restore" : "Վերականգնել",
     "Delete" : "Ջնջել",
diff --git a/apps/files_trashbin/l10n/pl.js b/apps/files_trashbin/l10n/pl.js
index 0c11dab91d4..78c8edea81d 100644
--- a/apps/files_trashbin/l10n/pl.js
+++ b/apps/files_trashbin/l10n/pl.js
@@ -8,6 +8,7 @@ OC.L10N.register(
     "Delete" : "Usuń",
     "Delete permanently" : "Trwale usuń",
     "Error" : "Błąd",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Ten folder jest niedostępny, proszę sprawdzić logi lub skontaktować się z administratorem.",
     "restored" : "przywrócony",
     "No deleted files" : "Brak skasowanych plików",
     "You will be able to recover deleted files from here" : "Możesz przywrócić skasowane pliki stąd",
diff --git a/apps/files_trashbin/l10n/pl.json b/apps/files_trashbin/l10n/pl.json
index 8b56be020fb..32c385bb319 100644
--- a/apps/files_trashbin/l10n/pl.json
+++ b/apps/files_trashbin/l10n/pl.json
@@ -6,6 +6,7 @@
     "Delete" : "Usuń",
     "Delete permanently" : "Trwale usuń",
     "Error" : "Błąd",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Ten folder jest niedostępny, proszę sprawdzić logi lub skontaktować się z administratorem.",
     "restored" : "przywrócony",
     "No deleted files" : "Brak skasowanych plików",
     "You will be able to recover deleted files from here" : "Możesz przywrócić skasowane pliki stąd",
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index bcd73639d3c..46447908b90 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -204,7 +204,7 @@ class Trashbin {
 
 		$ownerView = new View('/' . $owner);
 		// file has been deleted in between
-		if (!$ownerView->file_exists('/files/' . $ownerPath)) {
+		if (is_null($ownerPath) || $ownerPath === '' || !$ownerView->file_exists('/files/' . $ownerPath)) {
 			return true;
 		}