Put in some exceptions to the bootstrap code