For ENG-5802, propagate error message back to client