[UPDATE] Added index call checks where missing