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

DCC-2655