diff --git a/lib/bh/core_ext/rails/form/fields_for_helper.rb b/lib/bh/core_ext/rails/form/fields_for_helper.rb
index 6b0b80f..ac5f1cf 100644
--- a/lib/bh/core_ext/rails/form/fields_for_helper.rb
+++ b/lib/bh/core_ext/rails/form/fields_for_helper.rb
@@ -11,8 +11,8 @@ def fields_for(record_name, record_object = nil, fields_options = {}, &block)
           record_object, fields_options = nil, record_object
         end
 
-        fields_options[:layout] ||= @options[:layout]
-        fields_options[:errors] ||= @options[:errors]
+        fields_options[:layout] ||= @options[:layout] if @options.has_key?(:layout)
+        fields_options[:errors] ||= @options[:errors] if @options.has_key?(:errors)
         title = fields_options.delete(:title) { record_name.to_s.humanize }
         wrap_in_fieldset = fields_options.fetch :fieldset, true
         fields = super record_name, record_object, fields_options, &block
@@ -20,4 +20,4 @@ def fields_for(record_name, record_object = nil, fields_options = {}, &block)
       end
     end
   end
-end
\ No newline at end of file
+end