Merge "Better error message when temp files can't be created" into main