Added Error Handling global and site specific