Feedback from last change.

Change error code and buffer size tweak.