Bug 58053 - exceptions cannot be strings anymore

Change-Id: I820a729a586c4dc24d3a4c12ba7b5dcda660ff7f