Don't swallow exceptions (and fix a test too)
Merge pull request #1059 from engineyard/raise_exceptions

Don't swallow exceptions (and fix a test too)