Some null checks and registered events extended

Signed-off-by: Oliver Libutzki <o.libutzki@external.telekom.de>