implement move

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
try harder to avoid dereferencing nil in odd failure cases

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>