Fixed some NullPointerExceptions that have been caught anyways.

Change-Id: I763464cbc0747f7180df955cd2ac21e28c9926fc
Signed-off-by: mstegmaier <michael-1.stegmaier@uni-ulm.de>