Improved fault-handling logic
removed info log gaurd check