Yesenfei

merge the try catch