Prep for ability to handle incomplete results