Merge pull request #263 from daniellemayne/2014.08

avoid NPE on product filtering