Patches for error.h and error.c