diff --git a/plugins/community_track/lib/community_track_plugin/step.rb b/plugins/community_track/lib/community_track_plugin/step.rb
index 0c2b9bc..92bb905 100644
--- a/plugins/community_track/lib/community_track_plugin/step.rb
+++ b/plugins/community_track/lib/community_track_plugin/step.rb
@@ -7,7 +7,7 @@ class CommunityTrackPlugin::Step < Folder
   acts_as_list  :scope => :parent
 
   def belong_to_track
-    errors.add(:parent, "Step not allowed at this parent.") if !parent.kind_of?(CommunityTrackPlugin::Track)
+    errors.add(:parent, _("Step not allowed at this parent.")) unless parent.kind_of?(CommunityTrackPlugin::Track)
   end
 
   validate :belong_to_track
diff --git a/plugins/community_track/lib/community_track_plugin/track.rb b/plugins/community_track/lib/community_track_plugin/track.rb
index 0fe67ed..221b6ad 100644
--- a/plugins/community_track/lib/community_track_plugin/track.rb
+++ b/plugins/community_track/lib/community_track_plugin/track.rb
@@ -49,8 +49,8 @@ class CommunityTrackPlugin::Track < Folder
     "community-track-plugin-track"
   end
 
-  #FIXME make this test
   def first_paragraph
+    return '' if body.blank?
     paragraphs = Hpricot(body).search('p')
     paragraphs.empty? ? '' : paragraphs.first.to_html
   end
diff --git a/plugins/community_track/test/unit/community_track_plugin/track_test.rb b/plugins/community_track/test/unit/community_track_plugin/track_test.rb
index 376cf4a..5ca89c8 100644
--- a/plugins/community_track/test/unit/community_track_plugin/track_test.rb
+++ b/plugins/community_track/test/unit/community_track_plugin/track_test.rb
@@ -110,4 +110,18 @@ class TrackTest < ActiveSupport::TestCase
     assert_equal [hidden_step], @track.hidden_steps
   end
 
+   should 'get first paragraph' do
+    @track.body = '<p>First</p><p>Second</p>'
+    assert_equal '<p>First</p>', @track.first_paragraph
+  end
+
+  should 'provide first_paragraph even if body was not given' do
+    assert_equal '', @track.first_paragraph
+  end
+
+  should 'provide first_paragraph even if body is nil' do
+    @track.body = nil
+    assert_equal '', @track.first_paragraph
+  end
+
 end
--
libgit2 0.21.2