Merge "Fix some exception messages and enhance unit tets" into nyc-mr1-dev