Add invalide id protection
Merge branch 'master' of https://github.com/Chavjoh/MATHunter