Tidy
Nearly got error checking into lucene properly, just need to make the tests pass