Fix NPE

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