Merge pull request #636 from pganssle/decimal_conversion

Catch non-ValueError exceptions in decimal