add exception
Merge branch 'master' of https://github.com/gamab/DistribuedProject