Fix check against nil for new role