diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultClient.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultClient.java
index c71fa657..37b60968 100644
--- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultClient.java
+++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultClient.java
@@ -20,8 +20,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.cloud.vault.VaultProperties.AppIdProperties;
 import org.springframework.cloud.vault.VaultProperties.AuthenticationMethod;
 import org.springframework.http.HttpEntity;
@@ -81,7 +79,8 @@ public class VaultClient {
 		Exception error = null;
 		String errorBody = null;
 
-		URI uri = this.rest.getUriTemplateHandler().expand(url, secureBackendAccessor.variables());
+		URI uri = this.rest.getUriTemplateHandler().expand(url,
+				secureBackendAccessor.variables());
 		log.info(String.format("Fetching config from server at: %s", uri));
 
 		try {
@@ -96,12 +95,16 @@ public class VaultClient {
 				}
 			}
 		}
-		catch (HttpServerErrorException e) {
-			error = e;
+		catch (HttpServerErrorException | HttpClientErrorException e) {
+
 			if (MediaType.APPLICATION_JSON
 					.includes(e.getResponseHeaders().getContentType())) {
 				errorBody = e.getResponseBodyAsString();
 			}
+
+			if (e.getStatusCode() != HttpStatus.NOT_FOUND) {
+				error = e;
+			}
 		}
 		catch (Exception e) {
 			error = e;
diff --git a/src/test/bash/install_vault.sh b/src/test/bash/install_vault.sh
index 8eb28e88..1db72bfb 100755
--- a/src/test/bash/install_vault.sh
+++ b/src/test/bash/install_vault.sh
@@ -6,24 +6,22 @@
 ###########################################################################
 
 
-VAULT_VER="0.5.2"
+VAULT_VER="0.6.0"
 UNAME=$(uname -s |  tr '[:upper:]' '[:lower:]')
 VAULT_ZIP="vault_${VAULT_VER}_${UNAME}_amd64.zip"
 IGNORE_CERTS="${IGNORE_CERTS:-no}"
 
-
 # cleanup
-mkdir -p vault/download
-cd vault
+mkdir -p vault
 
 if [[ ! -f "download/${VAULT_ZIP}" ]] ; then
     cd download
     # install Vault
     if [[ "${IGNORE_CERTS}" == "no" ]] ; then
-      echo "Downloading consul with certs verification"
+      echo "Downloading Vault with certs verification"
       wget "https://releases.hashicorp.com/vault/${VAULT_VER}/${VAULT_ZIP}"
     else
-      echo "WARNING... Downloading consul WITHOUT certs verification"
+      echo "WARNING... Downloading Vault WITHOUT certs verification"
       wget "https://releases.hashicorp.com/vault/${VAULT_VER}/${VAULT_ZIP}" --no-check-certificate
     fi
 
@@ -34,11 +32,13 @@ if [[ ! -f "download/${VAULT_ZIP}" ]] ; then
     cd ..
 fi
 
+cd vault
+
 if [[ -f vault ]] ; then
   rm vault
 fi
 
-unzip download/${VAULT_ZIP}
+unzip ../download/${VAULT_ZIP}
 chmod a+x vault
 
 # check