diff --git a/rowers/templates/workout_form.html b/rowers/templates/workout_form.html
index 26edc221..6c9c6b25 100644
--- a/rowers/templates/workout_form.html
+++ b/rowers/templates/workout_form.html
@@ -147,14 +147,14 @@
     <div id="thumb-container" class="grid_2 alpha">
       <a href="/rowers/graph/{{ graph.id }}/">
 	<img src="/{{ graph.filename }}" 
-	     onerror="this.src='/static/img/waiting.png'"
+	     onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	     alt="{{ graph.filename }}" width="120" height="100"></a>
     </div>	
     {% elif forloop.counter == 3 %}
     <div id="thumb-container" class="grid_2 omega">
       <a href="/rowers/graph/{{ graph.id }}/">
 	<img src="/{{ graph.filename }}" 
-	     onerror="this.src='/static/img/waiting.png'"
+	     onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	     alt="{{ graph.filename }}" width="120" height="100"></a>
     </div>	
     
diff --git a/rowers/views.py b/rowers/views.py
index 7f0729ec..a56b1f81 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -6672,8 +6672,11 @@ def workout_flexchart3_view(request,*args,**kwargs):
             yparam2 = 'hr'
 
     if not request.user.is_anonymous():
+        r = getrower(request.user)
         if favoritenr>=0 and r.showfavoritechartnotes:
             favoritechartnotes = favorites[favoritenr].notes
+        else:
+            favoritechartnotes = ''
     else:
         favoritechartnotes = ''
         favoritenr = 0
diff --git a/static/img/ajax_loader_blue_350.gif b/static/img/ajax_loader_blue_350.gif
new file mode 100644
index 00000000..4d45f5fb
Binary files /dev/null and b/static/img/ajax_loader_blue_350.gif differ