improved flow error handling, clients