Revert "can't propogate exception or something swallows it"

This reverts commit 8223e0899bae5d572647e16c71d7f703f66bd2fc.
Revert "catch create exceptions within get_or_create"

This reverts commit efc605b1f6a821b3f737ded8fe43e9ff3df7aa2d.
Merge branch 'fireteam' into gb_master