Merge pull request #2653 from lambdageek/dev/exception_type-1