Remaining useless else
Remove useless else with throw
Remove duplicate unset()
Merge pull request #5789 from lucasmichot/4.2-useless-else

[4.2] : Remove useless else