gistfile1.txt

~/git/src/merb-more/merb-haml (master)$ gd
diff --git a/merb-haml/lib/merb-haml.rb b/merb-haml/lib/merb-haml.rb
index 88184a6..da89952 100644
--- a/merb-haml/lib/merb-haml.rb
+++ b/merb-haml/lib/merb-haml.rb
@@ -5,7 +5,7 @@ if defined?(Merb::Plugins)
   Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__) / "merb-haml" / "merbtasks"))
 
   Merb::BootLoader.after_app_loads do
-    if File.directory?(Merb::Config[:sass][:template_location] || Merb.dir_for(:stylesheet) / "sass")
+    if File.directory?((Merb::Config[:sass] && Merb::Config[:sass][:template_location]) || Merb.dir_for(:stylesheet) / "sass")
       require "sass/plugin" 
       Sass::Plugin.options = Merb::Config[:sass] if Merb::Config[:sass]
     end
~/git/src/merb-more/merb-haml (master)$