Merge "Improve error logging" into main