handle package, msgid, and keywords being undefined
Merge branch 'master' into debian
don't go past end of @msg when setting
Merge branch 'master' into debian