Fix: Add missing throws tags
Merge pull request #6164
Merge pull request #6164 in master