Merge "Improve invalid object logging"