Exception has wrong string for list

Change-Id: I07df275aae18aab8ef1c3bc62ce0f1b42ebe06e1
Merge "Exception has wrong string for list"