Better failure checking on other values