diff --git a/release/docker/Dockerfile b/release/docker/Dockerfile
index 10313f003..7fd9855ad 100644
--- a/release/docker/Dockerfile
+++ b/release/docker/Dockerfile
@@ -86,4 +86,9 @@ RUN export PIP_BREAK_SYSTEM_PACKAGES=1 PIP_ROOT_USER_ACTION=ignore && \
 # Clean up before finishing.
 RUN apt-get clean
 
+# Create a non-root user and switch to it.
+RUN useradd -m -s /bin/bash tfq-user
+USER tfq-user
+WORKDIR /home/tfq-user
+
 CMD ["/bin/bash"]
diff --git a/tensorflow_quantum/core/ops/load_module.py b/tensorflow_quantum/core/ops/load_module.py
index a98a27422..e04876772 100644
--- a/tensorflow_quantum/core/ops/load_module.py
+++ b/tensorflow_quantum/core/ops/load_module.py
@@ -47,7 +47,7 @@ def _load(self):
             try:
                 path = resource_loader.get_path_to_datafile(self._name)
                 self._module = load_library.load_op_library(path)
-            except:
+            except Exception:  # pylint: disable=broad-except
                 path = os.path.join(get_python_lib(),
                                     "tensorflow_quantum/core/ops", self._name)
                 self._module = load_library.load_op_library(path)