added exception stuff
Merge branch 'master' of github.com:Sch3lp/Fiazard