Add onSiteError to catch all errors?