Catch only the exception type(s) we expect.
Cleaned up test.  Still intermittently fails.
Merge pull request #29 from intchanter/a86cbd60c983b2dfcc0c162861c0c714093647a2

Test changes.