Correctly handle explicit None values

With test.

Signed-off-by: Zack Cerza <zack@redhat.com>
Re-store improvised owner value

Signed-off-by: Zack Cerza <zack@redhat.com>