fixed orphaned handler checks