diff --git a/tracks/app/views/stats/_totals.rhtml b/tracks/app/views/stats/_totals.rhtml
index 3abed60f..806342c6 100755
--- a/tracks/app/views/stats/_totals.rhtml
+++ b/tracks/app/views/stats/_totals.rhtml
@@ -7,11 +7,16 @@
 Of those <%= @contexts.count(:conditions => ["hide = ?", false])%> are visible contexts and 
 <%= @contexts.count(:conditions => ["hide = ?", true]) %> are hidden contexts
 
+<% unless @actions.count == 0 -%>
 <p>You have <%= @actions.count(:conditions => "completed_at IS NULL") %> uncompleted actions of which
 <%= @actions.count(:conditions => "completed_at IS NULL AND NOT show_from IS NULL") %> are 
 deferred actions. </p>
+
 <p>Since your first action on <%= format_date(@first_action.created_at) %> you have 
 a total of <%= @actions.count %> actions. 
 <%= @actions.count(:conditions => "NOT completed_at IS NULL") %> of these are completed.
+
 <p>You have <%= @tags.count-%> tags placed on actions. Of those tags, 
-<%= @unique_tags.size -%> are unique.
\ No newline at end of file
+<%= @unique_tags.size -%> are unique.
+<% end -%>
+
diff --git a/tracks/app/views/stats/index.rhtml b/tracks/app/views/stats/index.rhtml
index 140b7882..e7168fa8 100755
--- a/tracks/app/views/stats/index.rhtml
+++ b/tracks/app/views/stats/index.rhtml
@@ -3,6 +3,8 @@
 
 <%= render :partial => 'totals' -%>
 
+<% unless @actions.count == 0 -%>
+
 <h2>Actions</h2>
 
 <%= render :partial => 'actions' -%>
@@ -18,4 +20,11 @@
 <h2>Tags</h2>
 
 <%= render :partial => 'tags' -%>
+
+<% else -%>
+
+<p>More statistics will appear here once you have added some actions.</p>
+	
+<% end -%>
+
 </div>
\ No newline at end of file