Respect TraitFilters

Change 1
At least check for null here.  No need to throw unnecessarily.  Also add a comment about V11's signature.