Roy Chung-Cheng Lou

Looks like some behaviors of error handling are changed because of my patch. I've updated unit test to reflect the patch. Please let me know if the patch looks good....