Merge "Handle error in front-end"