* MM-23272: fix unhandled exception * MM-22372: removed extra log command * MM-22372: fix merge conflict