Cleanup error handling.
Lets not introduce an buffer overun trying to fix an other.