diff --git a/lib/rexml/node.rb b/lib/rexml/node.rb
index 9f51b51fc1..5f414c03ef 100644
--- a/lib/rexml/node.rb
+++ b/lib/rexml/node.rb
@@ -25,7 +25,7 @@ module REXML
 		end
 
 		def indent to, ind
- 			if @parent and not @parent.context[:indentstyle].nil? then
+ 			if @parent and @parent.context and not @parent.context[:indentstyle].nil? then
  				indentstyle = @parent.context[:indentstyle]
  			else
  				indentstyle = '  '
diff --git a/lib/rexml/rexml.rb b/lib/rexml/rexml.rb
index 5ff9075425..4d2a95b022 100644
--- a/lib/rexml/rexml.rb
+++ b/lib/rexml/rexml.rb
@@ -22,5 +22,5 @@
 module REXML
 	Copyright = "Copyright #{Time.now.year} Sean Russell <ser@germane-software.com>"
 	Date = "+2004/047"
-	Version = "2.7.4.1"
+	Version = "2.7.4.2"
 end