Tracking PR for a few error handling fixes [Do Not Merge]