More crash fixes.
Merge branch 'master' of github.com:christophertfoo/SOLR_Predict