Hopefully resolve issues with overzealous aborting.

Please tell me otherwise.