diff --git a/commands b/commands
index fda9575..eb3209f 100755
--- a/commands
+++ b/commands
@@ -195,6 +195,8 @@ case "$1" in
     ;;
 
   $PLUGIN_COMMAND_PREFIX:info)
+    [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
+    verify_service_name "$2"
     service_info $2
     ;;
 
diff --git a/functions b/functions
index 5fbe2a3..084d20d 100755
--- a/functions
+++ b/functions
@@ -41,9 +41,6 @@ service_alias() {
 }
 
 service_info() {
-  [[ -z $1 ]] && dokku_log_fail "Please specify a name for the service"
-  verify_service_name "$1"
-
   local SERVICE="$1";
   local SERVICE_URL=$(service_url "$SERVICE")