Pass exception message through to generated exceptions

See related #117 and #116