Logging exception instead of throwing a new one
Removed non export comment
Removed commented and unused code
Merge branch 'master' of git@github.com:Delors/Vespucci2.git