More checks on handler_tree