Fix NPE on FilterList
Merge pull request #942 from emmanuel-keller/1.5

Fix NPE on FilterList