diff --git a/eos/db/saveddata/queries.py b/eos/db/saveddata/queries.py
index fe4f0310c..b71f6b98a 100644
--- a/eos/db/saveddata/queries.py
+++ b/eos/db/saveddata/queries.py
@@ -186,7 +186,7 @@ def getFit(lookfor, eager=None):
     else:
         raise TypeError("Need integer as argument")
 
-    if fit.isInvalid:
+    if fit and fit.isInvalid:
         with sd_lock:
             removeInvalid([fit])
         return None
diff --git a/eos/effectHandlerHelpers.py b/eos/effectHandlerHelpers.py
index c658cf0a9..bfc12da5e 100644
--- a/eos/effectHandlerHelpers.py
+++ b/eos/effectHandlerHelpers.py
@@ -17,7 +17,7 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 #===============================================================================
 
-from sqlalchemy.orm.attributes import flag_modified
+#from sqlalchemy.orm.attributes import flag_modified
 import eos.db
 import eos.types
 import logging
@@ -107,7 +107,9 @@ class HandledList(list):
 
     def remove(self, thing):
         # We must flag it as modified, otherwise it not be removed from the database
-        flag_modified(thing, "itemID")
+        # @todo: flag_modified isn't in os x skel. need to rebuild to include
+        #flag_modified(thing, "itemID")
+        thing.itemID = 0
         list.remove(self, thing)
 
 class HandledModuleList(HandledList):