Fix Erik's awkward new exception