diff --git a/server/docker.js b/server/docker.js
index ed9e08545..1c939d647 100644
--- a/server/docker.js
+++ b/server/docker.js
@@ -59,7 +59,7 @@ class DockerHost {
      * @param {Object} dockerHost Docker host to check for
      * @returns {number} Total amount of containers on the host
      */
-    static async getAmountContainer(dockerHost) {
+    static async testDockerHost(dockerHost) {
         const options = {
             url: "/containers/json?all=true",
             headers: {
@@ -72,14 +72,32 @@ class DockerHost {
             }),
         };
 
-        if (dockerHost.docker_type === "socket") {
-            options.socketPath = dockerHost.docker_daemon;
-        } else if (dockerHost.docker_type === "tcp") {
-            options.baseURL = dockerHost.docker_daemon;
+        if (dockerHost.dockerType === "socket") {
+            options.socketPath = dockerHost.dockerDaemon;
+        } else if (dockerHost.dockerType === "tcp") {
+            options.baseURL = dockerHost.dockerDaemon;
         }
 
         let res = await axios.request(options);
-        return res.data.length;
+
+        if (Array.isArray(res.data)) {
+
+            if (res.data.length > 1) {
+
+                if ("ImageID" in res.data[0]) {
+                    return res.data.length;
+                } else {
+                    throw new Error("Invalid Docker response, is it Docker really a daemon?");
+                }
+
+            } else {
+                return res.data.length;
+            }
+
+        } else {
+            throw new Error("Invalid Docker response, is it Docker really a daemon?");
+        }
+
     }
 }
 
diff --git a/server/socket-handlers/docker-socket-handler.js b/server/socket-handlers/docker-socket-handler.js
index 7f3646bb1..5a53494db 100644
--- a/server/socket-handlers/docker-socket-handler.js
+++ b/server/socket-handlers/docker-socket-handler.js
@@ -1,6 +1,7 @@
 const { sendDockerHostList } = require("../client");
 const { checkLogin } = require("../util-server");
 const { DockerHost } = require("../docker");
+const { log } = require("../../src/util");
 
 /**
  * Handlers for docker hosts
@@ -52,15 +53,22 @@ module.exports.dockerSocketHandler = (socket) => {
         try {
             checkLogin(socket);
 
-            let amount = await DockerHost.getAmountContainer(dockerHost);
+            let amount = await DockerHost.testDockerHost(dockerHost);
+            let msg;
+
+            if (amount > 1) {
+                msg = "Connected Successfully. Amount of containers: " + amount;
+            } else {
+                msg = "Connected Successfully, but there are no containers?";
+            }
 
             callback({
                 ok: true,
-                msg: "Amount of containers: " + amount,
+                msg,
             });
 
         } catch (e) {
-            console.error(e);
+            log.error("docker", e);
 
             callback({
                 ok: false,