BZ961: Fix interceptor minor code