Merge "Actually check if roles are set"