Strip the severity trailing the exception message

Also fixed something else I'd messed up raising the exception.