Missing null checkes

[cornelius-behrend]

While updating from version 1.5.23 to 1.5.27 I discovered some missing checks for the data field.

I have created a patch for future reference.

alpaca+1.5.27.txt