Proper string formatting in exception messages

Change-Id: I59b5525b6c9f00fbfe56910baa904aa82dcead6c
Merge "Proper string formatting in exception messages"