Merge "Log error instead of throw exception until we find the reproduce steps" into main