Add in a Handled check