Nullpointerexception Bug

Change-Id: Icd2751b3a159d334b2977bcc6e3185ec2cb29965
Signed-off-by: Martika <martikaschwan@yahoo.de>