Improved the unauthorized access interceptor