diff --git a/ninjalog_uploader.py b/ninjalog_uploader.py
index 18ca64d3e5..fa19693d2c 100755
--- a/ninjalog_uploader.py
+++ b/ninjalog_uploader.py
@@ -45,7 +45,10 @@ def IsGoogler():
                      shell=True)
   if p.returncode != 0:
     return False
-  l = p.stdout.splitlines()[0]
+  lines = p.stdout.splitlines()
+  if len(lines) == 0:
+    return False
+  l = lines[0]
   # |l| will be like 'Login as <user>@google.com' for googler using goma.
   return l.startswith('Login as ') and l.endswith('@google.com')
 
diff --git a/tests/ninjalog_uploader_test.py b/tests/ninjalog_uploader_test.py
index facc20dfcb..a4098e72f2 100755
--- a/tests/ninjalog_uploader_test.py
+++ b/tests/ninjalog_uploader_test.py
@@ -25,7 +25,11 @@ class NinjalogUploaderTest(unittest.TestCase):
 
     with unittest.mock.patch('subprocess.run') as run_mock:
       run_mock.return_value.returncode = 1
-      run_mock.return_value.stdout = 'Not logged in\n'
+      self.assertFalse(ninjalog_uploader.IsGoogler())
+
+    with unittest.mock.patch('subprocess.run') as run_mock:
+      run_mock.return_value.returncode = 0
+      run_mock.return_value.stdout = ''
       self.assertFalse(ninjalog_uploader.IsGoogler())
 
     with unittest.mock.patch('subprocess.run') as run_mock: