I think I made this comment in another PR already, but we should avoid the wide open `except` here, and just do `if...raise` rather than the assert.