Log exceptions to better aid debugging.

In several error cases, we weren't logging the underlying exception.
Make a few minor cleanups (no else after return), etc.