Bulletproofing
(cherry picked from commit 001981b668b567065a5af33b23d44ae894e8b5cd)