Fix NullPointerException for SISIS
added: FH Brandenburg
added: Möckmühl