Added exception handler in production