Cherry-pick 2 commits included in upstream #202

to fix issues discovered by static analysis.

This and !11 (closed) are the only remaining Ubuntu differences from the Debian package.