Merge branch 'jk/read-in-full-stops-on-error'