Add a check that the entity returned is entityinterface