Fix appending int to string in an exception message
Merge remote-tracking branch 'potatoesmaster/strfix'