Exceptionhandling reverted
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git