Ensure a null pointer cannot come up.
Bump version to 0.21.1 and update changelog