some bugfixes and some exception handling
Merge branch 'master' of github.com:nerfingen/BallOfSteel
Merge branch 'master' of github.com:nerfingen/BallOfSteel