Fixed bug caused by change that prevents the find() accepting a null value