Make the ADD logic for the fallback rng stuff safer