NPE Fix

Change-Id: Ib02b127020460c4c9f4b356f9e4997ef7adb70dc
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>