Resolve @kluver's comments on #525

- Fix logging statement
- Clean up exception propagation