Merge pull request #3 from apache/base-exception

Don't catch BaseException