Add error checking on Primary.