Add logs mechamisn + Skip non-critcial error
