code coverage improvements. remove unreachable code.
Merge branch 'master' of https://github.com/jsr107/RI