added a couple of exceptions
Merge branch 'javdb2' of https://github.com/aydex/IT1901-Gruppe11