handle escaped call, fix return of client generator