diff --git a/app/views/stash_engine/user_admin/_admin_user_table.html.erb b/app/views/stash_engine/user_admin/_admin_user_table.html.erb
index 108fd0409..2a9b941ff 100644
--- a/app/views/stash_engine/user_admin/_admin_user_table.html.erb
+++ b/app/views/stash_engine/user_admin/_admin_user_table.html.erb
@@ -67,7 +67,7 @@
       <td>
         <div class="c-lined-table__with-actions">
         <div class="c-lined-table__data" id="user_role_<%= u.id %>">
-          <%= u.roles.present? ? u.roles.admin_roles.map{|r| "#{r.role_object_type&.delete_prefix("StashEngine::")&.sub('JournalOrganization', 'Publisher')} #{r.role}".strip.capitalize }.join(", ") : "User" %>
+          <%= u.roles&.admin_roles.present? ? u.roles.admin_roles.map{|r| "#{r.role_object_type&.delete_prefix("StashEngine::")&.sub('JournalOrganization', 'Publisher')} #{r.role}".strip.capitalize }.join(", ") : "User" %>
         </div>
         <% if policy([:stash_engine, :user]).set_role? %>
         <div class="c-lined-table__actions">
diff --git a/app/views/stash_engine/user_admin/edit.js.erb b/app/views/stash_engine/user_admin/edit.js.erb
index d58554965..b38b66da3 100644
--- a/app/views/stash_engine/user_admin/edit.js.erb
+++ b/app/views/stash_engine/user_admin/edit.js.erb
@@ -7,6 +7,6 @@ when 'tenant_id'
 end %>";
 <% if @field == 'tenant_id' %>
 $('#edit_roles_form').html("<%= escape_javascript(render partial: 'admin_role_form', locals: { user: @user }) %>");
-document.getElementById('user_role_<%= @user.id %>').innerHTML = "<%= @user.roles.present? ? @user.roles.map{|r| "#{r.role_object_type&.delete_prefix("StashEngine::")&.sub('JournalOrganization', 'Publisher')} #{r.role}".strip.capitalize }.join(", ") : "User" %>";
+document.getElementById('user_role_<%= @user.id %>').innerHTML = "<%= @user.roles&.admin_roles.present? ? @user.roles.admin_roles.map{|r| "#{r.role_object_type&.delete_prefix("StashEngine::")&.sub('JournalOrganization', 'Publisher')} #{r.role}".strip.capitalize }.join(", ") : "User" %>";
 <% end %>
 document.getElementById('genericModalDialog').close();
\ No newline at end of file