Added error handling on export index