[DDC-2655] Don't let getOneOrNullResult throw NoResultException
Merge pull request #780 from terite/DDC-2655

[DDC-2655] Don't let getOneOrNullResult throw NoResultException