add some defensive coding

[msillence]

I'm almost tempted to also add a check for the null fields against the expected length of the data array