Merge "Adding a little more data to an exception." into sc-dev