Sane error handling without nested try/except blocks.
Sane error handling without nested try/except blocks.

(cherry picked from commit 79af2b3df29c61f6b44d7fd41877c771073fc270)

chouseknecht/galaxy,chouseknecht/galaxy,chouseknecht/galaxy,chouseknecht/galaxy