Nil entry bug fixed.