r10305: start implementing better error handling