[MEMBER][Wen Hao] - added more error handler.