Fix NullPointerException at DatabaseCrawlList.java:102
Implement #525
Merge pull request #528 from emmanuel-keller/master

Bug fixes and improvement