Bug 540404 - Fixed NPE - added guard conditions

Change-Id: I41930aa80dadd4bf098760daa8aaa7e1e0e4dafe
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
1 file changed