Remove redundant else/return block

Fixes #1741