Adds some exceptions
Merge branch 'master' of https://github.com/joalon/Labb5.git