Fix a little-traversed codepath that could cause some grief. Change-Id: I75e6931c3208a0f18b40446f23a2fdd5a0065ce8