incorporate feedback : patch use Exception, exception message, and @throws docblock