[RJA-1902][feature] error handling