Fix for unreachable code warning.

Oops, I miss when unreachable code was an error.
Merge pull request #2547 from paulp/issue/bogus-warning

Fix for unreachable code warning.