Add extra check to ensure role exisits