diff --git a/archive/community.applications-2017.11.25.txz b/archive/community.applications-2017.11.25.txz
index 04bb661a..069479db 100644
Binary files a/archive/community.applications-2017.11.25.txz and b/archive/community.applications-2017.11.25.txz differ
diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php
index 5cfe2208..19ac5a34 100644
--- a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php
+++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php
@@ -43,7 +43,7 @@
 	$officialRepo = str_replace("*","'",$communitySettings['favourite']);
 	$separateOfficial = true;
 }
-if ( is_dir("/var/lib/docker/containers") ) {
+if ( is_file("/var/run/dockerd.pid") && is_dir("/proc/".@file_get_contents("/var/run/dockerd.pid")) ) {
 	$communitySettings['dockerRunning'] = "true";
 } else {
 	$communitySettings['dockerSearch'] = "no";
@@ -1576,6 +1576,9 @@ function displaySearchResults($pageNumber,$viewMode) {
 # now correlate that to a template;
 # this section handles containers that have not been renamed from the appfeed
 	$all_files = glob("/boot/config/plugins/dockerMan/templates-user/*.xml");
+	if ( ! $all_files ) {
+		$all_files = array();
+	}
 	if ( $installed == "true" ) {
 		foreach ($info as $installedDocker) {
 			$installedImage = $installedDocker['Image'];