Fixes NPE when passing null string into PredicateParser#parse.
Merge branch 'release/2.1'