Add a failing test for the foreignkey assignment issue
Handle required ForeignKey DoesNotExist errors gracefully
Merge @bkonkle's pull request into development

And add style fixes to assuage my personal eccentricities.
Merge from develop.