diff --git a/app/models/profile.rb b/app/models/profile.rb
index ca02140..aac7af7 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -540,7 +540,7 @@ private :generate_url, :url_options
   end
 
   def custom_header
-    self[:custom_header] || environment.custom_header
+    self[:custom_header] || environment && environment.custom_header
   end
 
   def custom_header_expanded
@@ -556,7 +556,7 @@ private :generate_url, :url_options
   end
 
   def custom_footer
-    self[:custom_footer] || environment.custom_footer
+    self[:custom_footer] || environment && environment.custom_footer
   end
 
   def custom_footer_expanded
diff --git a/test/unit/profile_test.rb b/test/unit/profile_test.rb
index 1d91359..2de1e7e 100644
--- a/test/unit/profile_test.rb
+++ b/test/unit/profile_test.rb
@@ -851,7 +851,7 @@ class ProfileTest < Test::Unit::TestCase
     profile = Profile.new
     env = mock
     env.expects(:custom_header).returns('environment header')
-    profile.expects(:environment).returns(env)
+    profile.stubs(:environment).returns(env)
 
     assert_equal 'environment header', profile.custom_header
   end
@@ -860,7 +860,7 @@ class ProfileTest < Test::Unit::TestCase
     profile = Profile.new
     env = mock
     env.expects(:custom_footer).returns('environment footer')
-    profile.expects(:environment).returns(env)
+    profile.stubs(:environment).returns(env)
 
     assert_equal 'environment footer', profile.custom_footer
   end
--
libgit2 0.21.2