This update is to deal with nonetypes correctly.

Relevant PR: https://github.com/ansible/ansible/pull/10957