diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r4.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r3.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.3.0-r4.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap
index 12a17739af..74ede44eb5 100755
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap
@@ -18,7 +18,11 @@ BOOTSTRAP_PEERS="/var/run/etcd/bootstrap.config"
 BOOTSTRAP_DISCO="/var/run/etcd/bootstrap.disco"
 
 META_URL="http://169.254.169.254/latest"
-MY_IP=$(curl -s $META_URL/meta-data/local-ipv4)
+MY_IP=$(curl --fail -s $META_URL/meta-data/local-ipv4)
+if [ $? -ne 0 ]; then
+    echo "Request to meta-data service failed" >&2
+    exit 1
+fi
 
 ARGS="${ARGS} -name ${MY_IP} -addr ${MY_IP}:4001 -peer-addr ${MY_IP}:7001 -peer-bind-addr 0.0.0.0"
 
@@ -31,9 +35,6 @@ elif [ -e $BOOTSTRAP_PEERS ]; then
 	if [ -n "$IPS" ]; then
 		ARGS="${ARGS} -C ${IPS}"
 	fi
-else 
-	echo "Could not find any bootstrap configuration"
-	exit 1
 fi
 
 exec /usr/bin/etcd $ARGS
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service
index 52f96ef867..7865f88d7c 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=etcd
-Wants=coreos-c10n.service
+Requires=coreos-c10n.service
 After=coreos-c10n.service
 
 [Service]