Added null checks to avoid possible NPEs in release efresh service impl