fix ugly style + exception

also removed a false comment
Merge branch 'master' of https://github.com/Gruppe14/KIT-PSE