diff --git a/pms-cli b/pms-cli
index 602d4eb..fa682b4 100755
--- a/pms-cli
+++ b/pms-cli
@@ -68,9 +68,12 @@ while true; do
 done
 
 if ! find "$ROOTPATH/functions" -iname "$COMMAND" &> /dev/null; then
-  log e "$COMMAND is not a viable function!"
+  log e "'$COMMAND' is not a viable function!"
   exit 1
 fi
+if ! grep "$SUBCOMMAND" "$ROOTPATH/functions/$COMMAND" &> /dev/null; then
+  log e "'$SUBCOMMAND' is not viable command in '$COMMAND'"
+fi
 
 source "$ROOTPATH/functions/$COMMAND"
 "${COMMAND}_${SUBCOMMAND}" ${PARAMS[@]}