Better printing of error messages.
Removed patch file.