Fix error processing (Does this commit make unworkable binary?)