modification for exception logger
Corrected the conflicts
Conflicts merged