Bug fix for condition that role is nil