diff --git a/rowers/.#views.py b/rowers/.#views.py
deleted file mode 100644
index 1472b0bc..00000000
--- a/rowers/.#views.py
+++ /dev/null
@@ -1 +0,0 @@
-E408191@CZ27LT9RCGN72.18468:1521978923
\ No newline at end of file
diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index cd983a7b..6885e341 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -853,6 +853,9 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
                 powerperc=powerperc, powerzones=r.powerzones)
     row = rdata(f2, rower=rr)
 
+    if row.df.empty:
+        return (0, 'Error: CSV data file was empty')
+    
     dtavg = row.df['TimeStamp (sec)'].diff().mean()
 
     if dtavg < 1:
diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py
index 1ba59a54..4a1f4dc4 100644
--- a/rowers/plannedsessions.py
+++ b/rowers/plannedsessions.py
@@ -364,8 +364,9 @@ def get_sessions_manager(m,teamid=0,startdate=date.today(),
                          enddate=date.today()+timezone.timedelta(+1000)):
     if teamid:
         t = Team.objects.get(id=teamid)
+        rs = Rower.objects.filter(team__in=[t]).distinct()
         sps = PlannedSession.objects.filter(
-            team__in=[t],
+            rower__in=rs,
             manager=m,
             startdate__lte=enddate,
             enddate__gte=startdate,