Fix for ugly bug that rather than catching an AssertionError, it redefined it :-(