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

* commit '7945daa13cbadb67f3503a12ccdd76c8ef134367':
  Add information to error message