Made async exceptions work better