Make sure that we don't lose exceptions on the way