Fixes #3409
Merge pull request #3425 from edx/pk-set-can-be-none

pk_set can be None