null vs undefined fix...