diff --git a/utils/resedit/space.py b/utils/resedit/space.py
index b2e5268..1ee61c2 100644
--- a/utils/resedit/space.py
+++ b/utils/resedit/space.py
@@ -398,7 +398,7 @@ class Space:
           wgt.set_active_iter(model.get_iter(i))
         i = i+1
     except:
-      wgt.set_active_iter(model_iter(0))
+      wgt.set_active_iter(model.get_iter(0))
 
     # Tech.
     try:
@@ -799,6 +799,8 @@ class Space:
     commodity = self.__commodity_sel()
     if commodity != "":
       self.planets[self.cur_planet]["general"]["commodities"].remove(commodity)
+      if len(self.planets[self.cur_planet]["general"]["commodities"]) == 0:
+        del self.planets[self.cur_planet]["general"]["commodities"]
       self.__pupdate()
 
   """