Add an assortment of extra safety checks.