Fix bug when a badge is not found
Merge pull request #230 from dirkcuys/master

Fix incorrect exception catched
Merge pull request #231 from p2pu/master

Small bug fix for BadgeNotFoundException