Adjust templates to not return xmlns on errors (causes issues)