TCI - Improve NPE handling Change-Id: I19f72c4edcec5ffa2264f0acc865a1cb66b84d0f Signed-off-by: Eugen Neufeld <eneufeld@eclipsesource.com>