Remove exceptions launched in some cases
Merge pull request #740 from excilys/738_fix_exception

Remove exceptions launched in some cases