Fix NPE on FilterList
Merge pull request #943 from emmanuel-keller/1.6

Fix NPE on FilterList