Don't pop non-msg.  More.

Signed-off-by: Matt Benjamin <matt@linuxbox.com>