diff --git a/src/Model/Stricklers/Stricklers.py b/src/Model/Stricklers/Stricklers.py
index f205048fbb0b8b84d5d5a351fc56ba9b56134e37..09ecbe67a301be7752cc0df8647d52ebc9189978 100644
--- a/src/Model/Stricklers/Stricklers.py
+++ b/src/Model/Stricklers/Stricklers.py
@@ -49,6 +49,9 @@ class Stricklers(SQLSubModel):
             "FROM stricklers"
         )
 
+        if table is None:
+            return None
+
         for row in table:
             name = row[0]
             comment = row[1]
diff --git a/src/Model/Stricklers/StricklersList.py b/src/Model/Stricklers/StricklersList.py
index 6ed1269d533585567597603a00ef4ede67704478..049d9b833687b36d6246128763f295e8cfbef5f8 100644
--- a/src/Model/Stricklers/StricklersList.py
+++ b/src/Model/Stricklers/StricklersList.py
@@ -38,8 +38,7 @@ class StricklersList(SQLSubModel):
         return new
 
     def _sql_save(self, execute, data = None):
-        if len(self._stricks) != 0:
-            execute("DELETE FROM stricklers")
+        execute("DELETE FROM stricklers")
 
         objs = self._stricks
         return self._save_submodel(execute, objs, data)