Add error handling to revised local ocr logic and update unit tests

Add error handling to revised local ocr logic and update unit tests #1342