Merge "Add information to error message" into nyc-dev
am: 19d76fda3a

* commit '19d76fda3ada9bce91ac95110b10b6e075bc6726':
  Add information to error message