#6086: fix spelling and use a better exception to catch.
2 files changed