Merge pull request #1872 from eriksjolund/candidate/create-missing-error

Merge pull request #1872 from eriksjolund/candidate/create-missing-error #4509