Fixes #6063
incorporate feedback : patch use Exception, exception message, and @throws docblock
Merge pull request #6067