1 files changed, 5 insertions, 4 deletions
diff --git a/app/workers/mattermost/create_team_worker.rb b/app/workers/mattermost/create_team_worker.rb
index 168bdc7454d..95b63dac8ab 100644
--- a/app/workers/mattermost/create_team_worker.rb
+++ b/app/workers/mattermost/create_team_worker.rb
@@ -7,17 +7,18 @@ module Mattermost
 
     # Add 5 seconds so the first retry isn't 1 second later
     sidekiq_retry_in do |count|
-      5 + 5 ** n
+      5 + 5**n
     end
 
     def perform(group_id, current_user_id, options = {})
-      group = Group.find(group_id)
-      current_user = User.find(current_user_id)
+      group = Group.find_by(id: group_id)
+      current_user = User.find_by(id: current_user_id)
+      return unless group && current_user
 
       # The user that creates the team will be Team Admin
       response = Mattermost::Team.new(current_user).create(group, options)
 
-      ChatTeam.create(namespace: group, name: response['name'], team_id: response['id'])
+      group.create_chat_team(name: response['name'], team_id: response['id'])
     end
   end
 end