Fixing NPE and a race condition on initial load

Change-Id: Iab48097299f36366fae0849baa115feaa497b55b
1 file changed