Remove miss-leading exception.
Merge pull request #7006 from s0undt3ch/hotfix/remove-catchall-exception

Remove miss-leading exception.