Catch E874 error
Merge branch 'catch-error'