Add safety checks to bootstrap