diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index b675f6b3..896c54d9 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -84,7 +84,7 @@ module ProjectsHelper
     if grouped.keys.size > 1
       grouped_options_for_select(grouped, selected && selected.id)
     else
-      options_for_select(grouped.values.first, selected && selected.id)
+      options_for_select((grouped.values.first || []), selected && selected.id)
     end
   end
 
diff --git a/test/unit/helpers/projects_helper_test.rb b/test/unit/helpers/projects_helper_test.rb
index ce959884..ff99a15c 100644
--- a/test/unit/helpers/projects_helper_test.rb
+++ b/test/unit/helpers/projects_helper_test.rb
@@ -60,4 +60,9 @@ class ProjectsHelperTest < HelperTestCase
   def test_format_version_name_for_system_version
     assert_equal "OnlineStore - Systemwide visible version", format_version_name(Version.find(7))
   end
+  
+  def test_version_options_for_select_with_no_versions
+    assert_equal '', version_options_for_select([])
+    assert_equal '<option value="1" selected="selected">0.1</option>', version_options_for_select([], Version.find(1))
+  end
 end