await: fix multiple return points