guard for invalid component
Merging origin/dval/master-pending-render-corner-case into master