Added checks for disabled handlers, and made disabling working.