Merge "Add more information to exception thrown"