OCR better error handling
Merge pull request #856 from emmanuel-keller/1.5

OCR better error handling