Don't concatenate strings and exceptions

Change-Id: I5202b1a18634312e73efdd621e73e2f7f414511b