diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 43b2563b..8d75146e 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -780,7 +780,11 @@ def analysis_view_data(request,userid=0):
     elif function == 'compare':
         script,div = comparisondata(workouts,options)
     elif function == 'cp':
+<<<<<<< HEAD
         script, div = cpdata(workouts, options)
+=======
+        script, div = cpdata(workouts,options)
+>>>>>>> develop
     else:
         script = ''
         div = 'Unknown analysis functions'
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 71d6a4cf..0e95a9b1 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -4701,9 +4701,10 @@ def workout_upload_api(request):
                         if post_data['useremail'] in rwr.emailalternatives:
                             r = rwr
                             break
-                if post_data['useremail'] not in r.emailalternatives:
-                    message = {'status':'false','message':'could not find user'}
-                    return JSONResponse(status=400,data=message)
+                if r is not None and r.emailalternatives is not None:
+                    if post_data['useremail'] not in r.emailalternatives:
+                        message = {'status':'false','message':'could not find user'}
+                        return JSONResponse(status=400,data=message)
 
 
         if r is None: