Issue 120: Fixed possible NPE during indexing
1.4.7
Merge pull request #121 from Randgalt/master

1.4.7