Add a null-check for the roleId too