Code review feedback: defend against unwrapped elements [ci skip]
Code review feedback: defend against unwrapped elements [ci skip]

ty-po/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,dillia23/code-dot-org,dillia23/code-dot-org,pickettd/code-dot-org,ty-po/code-dot-org,rvarshney/code-dot-org,ty-po/code-dot-org,ty-po/code-dot-org,pickettd/code-dot-org,rvarshney/code-dot-org,rvarshney/code-dot-org,rvarshney/code-dot-org,ty-po/code-dot-org,rvarshney/code-dot-org,dillia23/code-dot-org,ty-po/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,rvarshney/code-dot-org,rvarshney/code-dot-org,ty-po/code-dot-org,dillia23/code-dot-org,dillia23/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,dillia23/code-dot-org,rvarshney/code-dot-org,ty-po/code-dot-org,dillia23/code-dot-org,dillia23/code-dot-org