diff --git a/glazier/lib/disk.py b/glazier/lib/disk.py
index d6766514..1bf6a074 100644
--- a/glazier/lib/disk.py
+++ b/glazier/lib/disk.py
@@ -31,7 +31,8 @@ def get_disk_space():
     return shutil.disk_usage('/')
   except FileNotFoundError:
     logging.error(
-        'Failed to locate OS partition. Could not determine disk size.')
+        'Failed to locate OS partition. Could not determine disk size.'
+    )
 
 
 def set_disk_space() -> None:
@@ -42,10 +43,14 @@ def set_disk_space() -> None:
   is actually needed.
   """
   space = get_disk_space()
-
+  if space is None:
+    return
   for k, v in space._asdict().items():
     try:
       registry.set_value(
-          f'disk_space_{k}_bytes', str(v), path=constants.REG_ROOT)
+          f'disk_space_{k}_bytes', str(v), path=constants.REG_ROOT
+      )
     except registry.Error as e:
-      logging.error('Failed to write %s_disk_space to registry: %s', k, str(e))
+      logging.error(
+          'Failed to write %s_disk_space to registry: %s', k, str(e)
+      )
diff --git a/glazier/lib/log_copy.py b/glazier/lib/log_copy.py
index 8fc03eb0..89e6e9e1 100755
--- a/glazier/lib/log_copy.py
+++ b/glazier/lib/log_copy.py
@@ -16,6 +16,7 @@
 import logging
 import logging.handlers
 import shutil
+from typing import Optional
 
 # do not remove: internal placeholder 1
 from glazier.lib import drive_map
@@ -46,11 +47,11 @@ def __init__(self):
     self._username = None
     self._password = None
 
-  def GetUsername(self) -> str:
+  def GetUsername(self) -> Optional[str]:
     """Override to provide share credentials."""
     return self._username
 
-  def GetPassword(self) -> str:
+  def GetPassword(self) -> Optional[str]:
     """Override to provide share credentials."""
     return self._password