Thanks to S.Çağlar for figuring out that we needed this!

Also fix a memory leak found by coverity.
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>