odd that apparently these only are checked in non-opt mode

Change-Id: Icbcd5f090e8fc63bf017ec83611ba9abf7335dae