added test resulting in NPE when combining count&distinct.
Merge pull request #32 from uweschaefer/master

added test resulting in NPE when combining count&distinct.