diff --git a/tensorboard/compat/tensorflow_stub/io/gfile.py b/tensorboard/compat/tensorflow_stub/io/gfile.py
index 983abf23135..f397b7cfdf1 100644
--- a/tensorboard/compat/tensorflow_stub/io/gfile.py
+++ b/tensorboard/compat/tensorflow_stub/io/gfile.py
@@ -199,8 +199,11 @@ def listdir(self, dirname):
         if not self.isdir(dirname):
             raise errors.NotFoundError(None, None, "Could not find directory")
 
-        entries = os.listdir(compat.as_str_any(dirname))
-        entries = [compat.as_str_any(item) for item in entries]
+        try:
+            entries = os.listdir(compat.as_str_any(dirname))
+            entries = [compat.as_str_any(item) for item in entries]
+        except OSError:
+            raise errors.NotFoundError(None, None, "Could not find directory")
         return entries
 
     def makedirs(self, path):