Nil equates to true need to use undef

Change-Id: Ifece33d8bb9b74ad90acf843a86d92475427f641