Some items picked up through automated code analysis. A few bits
of unreachable code and two unchecked return values.
Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>