Some small cleanups, see individual commits for details. Fixes a memory leak and some (null) messages.
(null)