2 files changed, 3 insertions, 3 deletions
diff --git a/lib/observer.rb b/lib/observer.rb
index e1b249e885..161297e70c 100644
--- a/lib/observer.rb
+++ b/lib/observer.rb
@@ -6,7 +6,7 @@ module Observable
   def add_observer(observer)
     @observer_peers = [] unless defined? @observer_peers
     unless observer.respond_to? :update
-      raise NameError, "observer needs to respond to `update'" 
+      raise NoMethodError, "observer needs to respond to `update'" 
     end
     @observer_peers.push observer
   end
diff --git a/lib/ostruct.rb b/lib/ostruct.rb
index a5c51022d4..d806c70466 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -30,7 +30,7 @@ class OpenStruct
     elsif args.length == 0
       @table[mid]
     else
-      raise NameError, "undefined method `#{mname}'", caller(1)
+      raise NoMethodError, "undefined method `#{mname}'", caller(1)
     end
   end
 
@@ -42,7 +42,7 @@ class OpenStruct
     str = "<#{self.class}"
     for k,v in @table
       str += " "
-      str += k
+      str += k.to_s
       str += "="
       str += v.inspect
     end