Merge changes Id1e619b8,I0becc304 into sc-dev

* changes:
  Fix some typo
  Add message for exception