[SJS-148][WIP]: Clean error message for _wait()