Add EPSErrorHandling.