Hmm... this is a sign of a deeper bug, but fix the immediate problem for now.