Move error handling to MakeError

Note: COMPLETELY BREAKS Xslate::PP. I repeat: COMPLETELY BREAKS Xslate::PP!