[APOLLO-2650] - added better logging