Exception handling
Merge branch 'master' of https://github.com/Namerian/W40k