Code

test: cope better with use of return for errors