Use get_or_create rather than get, by hacking a dependency

This fixed a crash experienced by Alex Rudnick. Props to him.
Changes from deployment