Fix the doesThrow assert and reformat some messages.