Small cleanup to propgate errors

Also, adding some more fixes around releasing locks on stop to
enable fast shutdown.
Merge pull request #460 from jyates/propagate-index-errors

Small cleanup to propgate errors