From 569fb1fffb216ad96721fe1f5d706535e9920154 Mon Sep 17 00:00:00 2001
From: Marc-Andre Lafortune <github@marc-andre.ca>
Date: Sun, 29 Apr 2012 00:51:56 -0400
Subject: Generate appropriate error more judiciously

---
 activemodel/lib/active_model/observing.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'activemodel/lib/active_model/observing.rb')

diff --git a/activemodel/lib/active_model/observing.rb b/activemodel/lib/active_model/observing.rb
index 5aa27f00da..cc60c9ac72 100644
--- a/activemodel/lib/active_model/observing.rb
+++ b/activemodel/lib/active_model/observing.rb
@@ -90,8 +90,9 @@ module ActiveModel
         def instantiate_observer(observer) #:nodoc:
           # string/symbol
           if observer.respond_to?(:to_sym)
-            observer.to_s.camelize.constantize.instance
-          elsif observer.respond_to?(:instance)
+            observer = observer.to_s.camelize.constantize
+          end
+          if observer.respond_to?(:instance)
             observer.instance
           else
             raise ArgumentError,
-- 
cgit v1.2.3