Add a bit of bulletproofing.