Updated addHandler to remove duplicate adds - uncovered other issue where searching for a nonexistant item causes a nullpointer exception