Merge branch 'jk/add-i-read-error'