cms-2309 add check for empty result