diff --git a/src/test/cucumber/gvm/list_candidates.feature b/src/test/cucumber/gvm/list_candidates.feature
index 4152aa65..04c96c14 100644
--- a/src/test/cucumber/gvm/list_candidates.feature
+++ b/src/test/cucumber/gvm/list_candidates.feature
@@ -10,6 +10,6 @@ Feature: List Candidates
 	Scenario: List all available Versions without a Candidate installed
 		Given I do not have a "grails" candidate installed
 		When I enter "gvm list grails"
-		Then I see "Stop! grails has never been installed."
+		Then I see "Available Grails Versions"
 
 
diff --git a/srv/scripts/gvm b/srv/scripts/gvm
index cf3981bc..bd86c02f 100755
--- a/srv/scripts/gvm
+++ b/srv/scripts/gvm
@@ -47,18 +47,8 @@ function check_not_installed {
 	fi
 }
 
-function check_candidate_present {
-	if [ ! -d "$GVM_DIR/$CANDIDATE" ]; then
-		echo ""
-		echo "Stop! $CANDIDATE has never been installed."
-		exit 0
-	fi
-}
-
 function build_version_csv {
 	CANDIDATE="$1"
-	check_candidate_present "$CANDIDATE"
-
 	CSV=""
 	for version in $(ls -1 $GVM_DIR/$CANDIDATE); do
 		if [ $version != 'current' ]; then
diff --git a/srv/scripts/install.sh b/srv/scripts/install.sh
index a9a4cf11..6729194f 100755
--- a/srv/scripts/install.sh
+++ b/srv/scripts/install.sh
@@ -126,6 +126,12 @@ curl -s "$GVM_SERVICE/res/gvm" > "$HOME/.gvm/bin/gvm"
 chmod +x "$HOME/.gvm/bin/gvm-init.sh"
 chmod +x "$HOME/.gvm/bin/gvm"
 
+echo "Creating candidate directories..."
+mkdir -p "$HOME/.gvm/groovy"
+mkdir -p "$HOME/.gvm/grails"
+mkdir -p "$HOME/.gvm/griffon"
+mkdir -p "$HOME/.gvm/gradle"
+
 echo "Attempting to update bash profile..."
 
 SNIPPET='[[ -s "$HOME/.gvm/bin/gvm-init.sh" ]] && source "$HOME/.gvm/bin/gvm-init.sh"'