Fine-tune exception handling when creating indexes
Move unnecessary interim indexes to final list