diff --git a/scripts/env/pkgset-use b/scripts/env/pkgset-use
index c9005ce..f837f43 100644
--- a/scripts/env/pkgset-use
+++ b/scripts/env/pkgset-use
@@ -7,14 +7,17 @@ display_error() {
 }
 
 function gvm_pkgset_use() {
-	[[ $gvm_go_name != "" ]] || 
-		display_error "No Go version selected"; return 1
+	[[ "$1" != "" ]] ||
+		display_error "Please specify a package set" || return 1
+
+	[[ "$gvm_go_name" != "" ]] || 
+		display_error "No Go version selected" || return 1
 
 	fuzzy_match=`ls $GVM_ROOT/environments | grep "$gvm_go_name@" | grep "$1"` ||
-		display_error "Invalid package set"; return 1
+		display_error "Invalid package set" || return 1
 
 	. "$GVM_ROOT/environments/$gvm_go_name@$1" ||
-		display_error "Failed to source the package set environment"; return 1
+		display_error "Failed to source the package set environment" || return 1
 
 	echo "Now using version $fuzzy_match"
 }