Merge xlib errorhandlers into one