diff --git a/.releaserc b/.releaserc
index a9ec985..44eca06 100644
--- a/.releaserc
+++ b/.releaserc
@@ -1,7 +1,9 @@
 {
   "branch": "master",
-  "verifyConditions": [],
+  "verifyConditions": ["@semantic-release/changelog", "@semantic-release/git", "@semantic-release/exec"],
   "prepare": [
+    "@semantic-release/changelog",
+    "@semantic-release/git",
     {
       "path": "@semantic-release/exec",
       "cmd": "bumpversion --current-version ${lastRelease.version} --new-version ${nextRelease.version} patch"
diff --git a/.travis.yml b/.travis.yml
index a4bf699..5f86a5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ install:
 - pip install --user bumpversion
 - npm install @semantic-release/exec
 - npm install @semantic-release/git
+- npm install @semantic-release/changelog
 notifications:
   email: false
 script:
diff --git a/core/config_utils.go b/core/config_utils.go
index 7daa4e1..e063e20 100644
--- a/core/config_utils.go
+++ b/core/config_utils.go
@@ -73,18 +73,18 @@ func getServicePropertiesFromCredentialFile(credentialKey string) map[string]str
 		credentialFilePath = envPath
 	}
 
-	// 2) <user-home-dir>/ibm-credentials.env
+	// 2) <current-working-directory>/ibm-credentials.env
 	if credentialFilePath == "" {
-		var filePath = path.Join(UserHomeDir(), DEFAULT_CREDENTIAL_FILE_NAME)
+		dir, _ := os.Getwd()
+		var filePath = path.Join(dir, DEFAULT_CREDENTIAL_FILE_NAME)
 		if _, err := os.Stat(filePath); err == nil {
 			credentialFilePath = filePath
 		}
 	}
 
-	// 3) <current-working-directory>/ibm-credentials.env
+	// 3) <user-home-dir>/ibm-credentials.env
 	if credentialFilePath == "" {
-		dir, _ := os.Getwd()
-		var filePath = path.Join(dir, DEFAULT_CREDENTIAL_FILE_NAME)
+		var filePath = path.Join(UserHomeDir(), DEFAULT_CREDENTIAL_FILE_NAME)
 		if _, err := os.Stat(filePath); err == nil {
 			credentialFilePath = filePath
 		}