typo fix
removed unreachable code
Merge pull request #1132 from jan-schreib/master

Removed unreachable code and fixed a typo.