Check that message is present before trying to include it in the exception
Merge pull request #48 from okgrow/master

Check that message is present before including it in the exception