Fixed the zero and empty row stuff for bug #8392.