Added Error handler class and external whitelist file