Add index exception handling