fix NPE during uninstall Change-Id: I62597b3a7c456e66ca266d657f6db5c6507cd9f0 Signed-off-by: Sounak Basu <sounak.basu@sap.com>