Adjust error handling per FE requirements
CC @lizlux