Fix for startup NPE.

Change-Id: I6928939d235faf544a85bb84bba2fa135ddc8e45
1 file changed