Unreachable code and bug in if-else clause

[tomsbergmanis]

Hi @Quentin-Anthony, in your merge, you broke the if clause by making it evaluate a tuple, making some code unreachable. You should add an/or operator.

[Quentin-Anthony]

Looks like this wasn't caused by the merge, but rather: dc4b81f#diff-46c4c76deb18adf1de8e0be6d4229baed5f1f0308e141479f5a993b3d83dd445

Just fixed in #1325. Thanks for pointing this out, and apologies for not testing that one more thoroughly!