updated to be a little less panicky about things we expect sometimes.