EB-8627: Refactored code to catch log in exception
Merge remote-tracking branch 'upstream/master'