diff --git a/images/02-console/docker-init b/images/02-console/docker-init
index f6f94714..4871158b 100755
--- a/images/02-console/docker-init
+++ b/images/02-console/docker-init
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 if [ -e /var/lib/rancher/conf/docker ]; then
     source /var/lib/rancher/conf/docker
@@ -9,8 +10,13 @@ while [ ! -e /run/console-done ]; do
 done
 
 DOCKER_BIN=$(which docker) || DOCKER_BIN=/usr/bin/docker
-if [ "$DOCKER_BIN" == "/usr/bin/docker" ] && [ -e /usr/local/bin/docker ]; then
-    DOCKER_BIN=/usr/local/bin/docker
-fi
+
+for i in /opt/bin /usr/local/bin; do
+    if [ -x ${i}/docker ]; then
+        PATH=${i}:$PATH
+        DOCKER_BIN=${i}/docker
+        break
+    fi
+done
 
 exec /usr/bin/dockerlaunch $DOCKER_BIN "$@" $DOCKER_OPTS >/var/log/docker.log 2>&1