Add more checks on indexed value existence