Merge branch 'fix-catch-errors'
Catch E874 error
Merge branch 'catch-error' into dev