More entity close checking.