Rordered so no owner falls through

Prevents db error when there is no owner
Merge pull request #56 from wcyrek/patch-1

Reordered so no owner falls through