Switch back to simpler "except AssertionError:"