Fixes reversed promises bug
Merge branch 'hotfix_findOrCreate'