Bullet proofing

Oops, an error occurred! Code: 20190121034040624113aa