diff --git a/bothub/api/v2/repository/serializers.py b/bothub/api/v2/repository/serializers.py
index 12dda54a..55213726 100644
--- a/bothub/api/v2/repository/serializers.py
+++ b/bothub/api/v2/repository/serializers.py
@@ -1015,18 +1015,20 @@ def create(self, validated_data):
         repository.versions.create(
             is_default=True, created_by=self.context["request"].user
         )
-        celery_app.send_task(
-            "send_recent_activity",
-            [
-                {
-                    "user": owner.user.email,
-                    "entity": "AI",
-                    "action": "CREATE",
-                    "entity_name": repository.name,
-                    "intelligence_id": repository.owner.organization.id
-                }
-            ]
-        )
+
+        if owner.user:
+            celery_app.send_task(
+                "send_recent_activity",
+                [
+                    {
+                        "user": owner.user.email,
+                        "entity": "AI",
+                        "action": "CREATE",
+                        "entity_name": repository.name,
+                        "intelligence_id": repository.owner.organization.id
+                    }
+                ]
+            )
         return repository
 
     def get_intents(self, obj):
diff --git a/bothub/api/v2/repository/views.py b/bothub/api/v2/repository/views.py
index f5b6a3fe..5c05b0aa 100644
--- a/bothub/api/v2/repository/views.py
+++ b/bothub/api/v2/repository/views.py
@@ -536,6 +536,7 @@ def train(self, request, **kwargs):
         user_authorization = repository.get_user_authorization(request.user)
         serializer = TrainSerializer(data=request.data)  # pragma: no cover
         serializer.is_valid(raise_exception=True)  # pragma: no cover
+        user = request.user
         if not user_authorization.can_write:
             raise PermissionDenied()
         request = repository.request_nlp_train(
@@ -549,7 +550,7 @@ def train(self, request, **kwargs):
             "send_recent_activity",
             [
                 {
-                    "user": request.user.email,
+                    "user": user.email,
                     "entity": "AI",
                     "action": "TRAIN",
                     "entity_name": repository.name,