Minor Code Coverage Improvements

Enjoying ```go test -cover``` and saw some minor untested lines of code. If this looks good then I would like to commit more code for test coverage.

Cheers.