Check for skipped tags in passed role variables before adding to them

Fixes #6330