* Fix NPE * Add unit test * Fix review findings Signed-off-by: Stefan Behl <stefan.behl@bosch-si.com>