Swap asserts in the code to raise

Better to get a more exact exception type (not AssertionError independent of type of error).