Handle RestDatasource errors
Removed unused events
Merge pull request #210 from apruden/index-robust

Handle RestDatasource errors