Better handling of errors.  Now errors will result in the markup being displayed just as it was.