update :
- remove some possible dereferencing of null pointers.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>