Avoid exception driven logic
Merge pull request #925 from romainneutron/avoid-exception-driven-logic

[3.8] Avoid exception driven logic