LEDGE-228: improved error handling semantics