[TASK] Fix unreachable code areas
Merge pull request #263 from cedricziel/fixUnreachableCode

[TASK] Fix unreachable code areas