Fix handling of non-existent groups

1 files changed, 3 insertions, 3 deletions

diff --git a/app/helpers/namespaces_helper.rb b/app/helpers/namespaces_helper.rb
index 2862fb63d9f..3f528c42cb6 100644
--- a/app/helpers/namespaces_helper.rb
+++ b/app/helpers/namespaces_helper.rb
@@ -19,15 +19,15 @@ module NamespacesHelper
       # group if one exists by that name to prevent duplicates.
       unless extra_group.persisted?
         existing_group = Group.find_by(name: extra_group.name)
-        extra_group = existing_group if existing_group
+        extra_group = existing_group if existing_group&.persisted?
       end
 
       if Ability.allowed?(current_user, :read_group, extra_group)
         selected = extra_group.id if selected == :extra_group
         groups |= [extra_group]
-      else
-        selected = :current_user
       end
+
+      selected ||= :current_user
     end
 
     options = []