Adjust error handling per FE requirements
CC @lizlux
Merge branch 'UC-111' into UC-136