Fix NPE on FilterList
Merge pull request #944 from emmanuel-keller/master

Fix NPE on FilterList