54315498 Make sure that expected fields are present even if they hadn't been

originally provided by the client.