Also consider blank entries as empty for correct.

Change-Id: I3741cecaa01fa7f683d4c0d6aef5d9d745ea6f55