tweak for future null deref warning

Change-Id: I38590e08a6bd03a2ddfeda466b9cee7128c62aa7