CON-1239 | fixed fetching non-existent data