More improvements to error handling for component selection/metadata rules

+review REVIEW-5248