fix unreachable code flagged by pylint
Merge pull request #45 from gurneyalex/7.0-fix_unreachable_code

fix unreachable code flagged by pylint