Really fix issue #41 by properly consuming error codes