Changed Exception handling
Merge branch 'master' of https://github.com/Zwolf11/BlottoBeats.git