diff --git a/migration/tables/content_items.py b/migration/tables/content_items.py
index e638a690..2b58c53d 100644
--- a/migration/tables/content_items.py
+++ b/migration/tables/content_items.py
@@ -38,56 +38,57 @@ def get_shout_slug(entry):
 
 
 def create_author_from_app(app):
+    user = None
     userdata = None
-    if app:
-        try:
-            with local_session() as session:
-                # check if email is used
-                user = session.query(User).where(User.email == app['email']).first()
-                if not user:
-                    print('[migration] creating user...')
-                    name = app.get('name')
-                    if name:
-                        slug = translit(name, "ru", reversed=True).lower()
-                        slug = re.sub('[^0-9a-zA-Z]+', '-', slug)
-                        # check if slug is used
-                        if slug:
+    with local_session() as session:
+        # check if email is used
+        user = session.query(User).where(User.email == app['email']).first()
+        if not user:
+            # print('[migration] app %r' % app)
+            name = app.get('name')
+            if name:
+                slug = translit(name, "ru", reversed=True).lower()
+                slug = re.sub('[^0-9a-zA-Z]+', '-', slug)
+                # check if slug is used
+                if slug:
+                    user = session.query(User).where(User.slug == slug).first()
+
+                    # get slug from email
+                    if user:
+                        slug = app['email'].split('@')[0]
+                        user = session.query(User).where(User.slug == slug).first()
+                        # one more try
+                        if user:
+                            slug += '-author'
                             user = session.query(User).where(User.slug == slug).first()
+                        else:
+                            # print(f'[migration] author @{slug} is found by email')
+                            pass
 
-                            # get slug from email
-                            if user:
-                                slug = app['email'].split('@')[0]
-                                user = session.query(User).where(User.slug == slug).first()
-                                # one more try
-                                if user:
-                                    slug += '-author'
-                                    user = session.query(User).where(User.slug == slug).first()
-                                else:
-                                    print(f'[migration] author @{slug} is found by email')
-
-                            else:
-                                print(f'[migration] author @{slug} is found')
+                    else:
+                        # print(f'[migration] author @{slug} is found')
+                        pass
 
 
-                    # create user with application data
-                    if not user:
-                        userdata = {
-                            "username": app["email"],
-                            "email": app["email"],
-                            "name": app.get("name", ""),
-                            "bio": app.get("bio", ""),
-                            "emailConfirmed": False,
-                            "slug": slug,
-                            "createdAt": ts,
-                            "lastSeen": ts,
-                        }
-                        user = User.create(**userdata)
-                        session.add(user)
-                        session.commit()
+            # create user with application data
+            if not user:
+                userdata = {
+                    "username": app["email"],
+                    "email": app["email"],
+                    "name": app.get("name", ""),
+                    "bio": app.get("bio", ""),
+                    "emailConfirmed": False,
+                    "slug": slug,
+                    "createdAt": ts,
+                    "lastSeen": ts,
+                }
+                # print('[migration] userdata %r' % userdata)
+                user = User.create(**userdata)
+                session.add(user)
+                session.commit()
+
+            if not userdata:
                 userdata = user.dict()
-        except Exception as e:
-            print(app)
-            raise e
         return userdata
 
 
@@ -108,13 +109,23 @@ async def create_shout(shout_dict):
 
 
 async def get_user(entry, storage):
+    app = entry.get("application")
+    userdata = None
+
+    if app:
+        userdata = create_author_from_app(app)
+        # print("[migration] from app")
+
     user_oid = entry.get("createdBy")
-    userdata = storage["users"]["by_oid"].get(user_oid)
+    if user_oid == "0":
+        userdata = discours
+
     if not userdata:
-        userdata = create_author_from_app(entry.get("application"))
-        print("[migration] from user_oid")
+        userdata = storage["users"]["by_oid"].get(user_oid)
+        # print("[migration] user from user_oid")
+
     if not userdata:
-        print("[migration] no app no user_oid")
+        # print("[migration] no app, no user_oid")
         userdata = anondict
     # cleanup slug
     slug = userdata.get("slug", "")