Create index by default
Only log the error if there was one
Merge branch 'index' into blackboard