handle if criteria null
Merge pull request #47 from januarsiregar/master

handle if criteria null