Use standard API, and don't write out the reply until we've set the error message.
Use standard API, and don't write out the reply until we've set the error message.

nathan-hoad/roland,nathan-hoad/roland