Change error message instead of cloning exception

Closes #582
2 files changed