Fix bug introduced in previous commit when pk is None
Bump version to v4.2.20