diff --git a/apps/files/js/filesummary.js b/apps/files/js/filesummary.js
index 46880272cdc..d69c5f1b53a 100644
--- a/apps/files/js/filesummary.js
+++ b/apps/files/js/filesummary.js
@@ -108,7 +108,7 @@
 
 			for (var i = 0; i < files.length; i++) {
 				file = files[i];
-				if (file.name.toLowerCase().indexOf(this.summary.filter) === -1) {
+				if (file.name && file.name.toLowerCase().indexOf(this.summary.filter) === -1) {
 					continue;
 				}
 				if (file.type === 'dir' || file.mime === 'httpd/unix-directory') {
diff --git a/search/js/search.js b/search/js/search.js
index b19a420cee8..b090a4ec4a8 100644
--- a/search/js/search.js
+++ b/search/js/search.js
@@ -234,6 +234,9 @@
 					} else {
 						// not showing result, decrease counter
 						var count = $status.data('count') - 1;
+						if (count < 0) {
+							count = 0;
+						}
 						$status.data('count', count)
 							.text(t('search', '{count} search results in other places', {count:count}, count));
 					}