Handle null pointer exception, just in case calling entitity doesn't check. Change-Id: I1b4809476cc689ad3dfd426e123a64e9a0336c87
Handle null pointer exception, just in case calling entitity doesn't check. Change-Id: I1b4809476cc689ad3dfd426e123a64e9a0336c87