Fix: Do not call "addHandler()" more than once even if the singleton is
destroyed