Prevention for catching unrelated exceptions added
Merge pull request #7095 from radeksimko/pokemon-exc-fix

Prevent catching unrelated exceptions