diff --git a/tools/toolkit-qa-check.sh b/tools/toolkit-qa-check.sh
index 91f5aef..4744796 100755
--- a/tools/toolkit-qa-check.sh
+++ b/tools/toolkit-qa-check.sh
@@ -318,6 +318,11 @@ echo "Issue: rm -rf with potentially empty variables = catastrophic data loss"
 echo ""
 
 while IFS=: read -r file line_num line_content; do
+    # Skip if it's in an echo/comment (documentation, not execution)
+    if echo "$line_content" | grep -qE '^\s*(echo|#)'; then
+        continue
+    fi
+
     # Check for rm -rf $var patterns where var might be empty
     if echo "$line_content" | grep -qE 'rm\s+-[a-z]*r[a-z]*f.*\$[A-Z_]+[^/]|rm\s+-[a-z]*r[a-z]*f\s+/?\$'; then
         # Skip if it has proper validation ([ -n "$var" ] && rm ...)
@@ -468,8 +473,11 @@ while read -r file; do
 
         # Check if function uses parameters
         if grep -A 20 "^[[:space:]]*$func_name()" "$file" 2>/dev/null | grep -q '\$[1-9]'; then
-            # Check if it validates them
-            if ! grep -A 5 "^[[:space:]]*$func_name()" "$file" 2>/dev/null | grep -qE '\[\s*-[nz]\s*"\$[1-9]"|\[\s*\$#\s*-'; then
+            # Check if it validates them (accepts both $1 and variable name patterns)
+            # Pattern 1: [ -z "$1" ] or [ -n "$1" ]
+            # Pattern 2: [ -z "$var_name" ] where var_name was assigned from $1
+            # Pattern 3: [ $# -lt 1 ] or similar
+            if ! grep -A 5 "^[[:space:]]*$func_name()" "$file" 2>/dev/null | grep -qE '\[\s*-[nz]\s*"\$([1-9]|[a-zA-Z_][a-zA-Z0-9_]*)"\s*\]|\[\s*\$#\s*-'; then
                 echo "HIGH|$file|$line_num|Function '$func_name' uses parameters without validation"
                 count_issue "HIGH"
                 ((count++))