diff --git a/eos/db/saveddata/override.py b/eos/db/saveddata/override.py
index 2d5d74a47..8245463e3 100644
--- a/eos/db/saveddata/override.py
+++ b/eos/db/saveddata/override.py
@@ -24,7 +24,7 @@ from eos.db import saveddata_meta
 from eos.types import Override
 
 overrides_table = Table("overrides", saveddata_meta,
-                     Column("itemID", Integer, primary_key=True,  index = True),
+                     Column("itemID", Integer, primary_key=True, index = True),
                      Column("attrID", Integer, primary_key=True, index = True),
                      Column("value", Float, nullable = False))
 
diff --git a/service/market.py b/service/market.py
index 916204e0e..7d1cdea19 100644
--- a/service/market.py
+++ b/service/market.py
@@ -707,7 +707,11 @@ class Market():
         overrides = eos.db.getAllOverrides()
         items = set()
         for x in overrides:
-            items.add(x.item)
+            if (x.item is None):
+                eos.db.saveddata_session.delete(x)
+                eos.db.commit()
+            else:
+                items.add(x.item)
         return list(items)
 
     def directAttrRequest(self, items, attribs):