Merge branch 'nd/fopen-errors'