Merge "Add more detail to exception message"