Merge branch 'ht/file-error'