diff --git a/app/models/environment.rb b/app/models/environment.rb
index 281fe51..d839d61 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -166,4 +166,8 @@ class Environment < ActiveRecord::Base
     end
   end
 
+  def to_s
+    self.name || '?'
+  end
+
 end
diff --git a/test/unit/environment_test.rb b/test/unit/environment_test.rb
index e4b655d..7780323 100644
--- a/test/unit/environment_test.rb
+++ b/test/unit/environment_test.rb
@@ -180,4 +180,15 @@ class EnvironmentTest < Test::Unit::TestCase
     
   end
 
+  should 'provide environment name in to_s' do
+    env = Environment.new(:name => 'my name')
+    assert_equal 'my name', env.to_s
+  end
+
+  should 'fallback to "?" when calling to_s with empty name' do
+    env = Environment.new(:name => nil)
+    assert_nil env.name
+    assert_equal "?", env.to_s
+  end
+
 end
--
libgit2 0.21.2