xinclude: Fix handling of catastrophic errors - Forward catastrophic errors from parser - Don't overwrite catastrophic errors