* fix potential null pointer exceptions * use contains key Signed-off-by: Eugen Freiter <freiter@gmx.de>