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

DDC-2655