fixed exceptions and other things
Merge branch 'master' of https://github.com/JoaoLReis/ProjectoAAJ