finish: also populate these variables even when blank

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>