Bulletproofing.
(cherry picked from commit 599ebd86de5a9fde62e84c53ce95b682899537e1)