semanage/seobject.py          | 5 ++++-

 sepolicy/sepolicy/generate.py | 6 ++++--

 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/semanage/seobject.py b/semanage/seobject.py

index 6a14f7b4..47859ca4 100644

--- a/semanage/seobject.py

+++ b/semanage/seobject.py

@@ -2297,7 +2297,10 @@ class fcontextRecords(semanageRecords):

         semanageRecords.__init__(self, args)

         try:

             self.valid_types = list(list(sepolicy.info(sepolicy.ATTRIBUTE, "file_type"))[0]["types"])

-            self.valid_types += list(list(sepolicy.info(sepolicy.ATTRIBUTE, "device_node"))[0]["types"])

+            __temp_device_node_list = list(sepolicy.info(sepolicy.ATTRIBUTE, "device_node"))

+            if __temp_device_node_list:

+                self.valid_types += list(__temp_device_node_list[0]["types"])

+            __temp_device_node_list = None

         except RuntimeError:

             pass

diff --git a/sepolicy/sepolicy/generate.py b/sepolicy/sepolicy/generate.py

index 4e1ed4e9..252e8dde 100644

--- a/sepolicy/sepolicy/generate.py

+++ b/sepolicy/sepolicy/generate.py

@@ -107,8 +107,10 @@ def get_all_ports():

 def get_all_users():

     users = [x['name'] for x in sepolicy.info(sepolicy.USER)]

-    users.remove("system_u")

-    users.remove("root")

+    if "system_u" in users:

+        users.remove("system_u")

+    if "root" in users:

+        users.remove("root")

     users.sort()

     return users