diff --git a/Vagrantfile b/Vagrantfile
index 967a8cbcc..91727306f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -42,7 +42,7 @@ source /etc/profile.d/gopath.sh
 
 echo Fetching Consul...
 cd /tmp/
-wget https://releases.hashicorp.com/consul/0.6.0/consul_0.6.0_linux_amd64.zip -O consul.zip
+wget https://releases.hashicorp.com/consul/0.6.4/consul_0.6.4_linux_amd64.zip -O consul.zip
 echo Installing Consul...
 unzip consul.zip
 sudo chmod +x consul
diff --git a/client/client.go b/client/client.go
index dd684c5e0..50a070e67 100644
--- a/client/client.go
+++ b/client/client.go
@@ -1192,7 +1192,11 @@ func (c *Client) syncConsul() {
 		select {
 		case <-sync.C:
 			// Give up pruning services if we can't fingerprint Consul
-			if _, ok := c.config.Node.Attributes["consul.server"]; !ok {
+
+			c.configLock.RLock()
+			_, ok := c.configCopy.Node.Attributes["consul.server"]
+			c.configLock.RUnlock()
+			if !ok {
 				continue
 			}
 			services := make(map[string]struct{})
diff --git a/vendor/github.com/logrus b/vendor/github.com/logrus
new file mode 160000
index 000000000..4b6ea7319
--- /dev/null
+++ b/vendor/github.com/logrus
@@ -0,0 +1 @@
+Subproject commit 4b6ea7319e214d98c938f12692336f7ca9348d6b