Moving that assertion to a more useful place