regression probably triggered by...

commit 2e3c45af
Date:   Fri Mar 4 07:38:16 2011 -0800
Remove usage of deprecated List container.

but that just stopped at the first NULL by chance

Change-Id: I767e3bc3130d99cedceb4172857d1741c677b19b