THRIFT-2380 unreachable code (CID 1174546, CID 1174679)

Patch: Jens Geyer