Ongoing work for better error message logging