Merge "Add information to error message" into nyc-dev