<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -208,28 +208,22 @@ module Rubygame::EventHandler::HasEventHandler
 	#   player.append_hook( hook )
 	# 
 	def append_hook( hook )
+		_make_event_handler if @event_handler.nil?
 		hook = _prepare_hook( hook )
 		@event_handler.append_hook( hook )
-	rescue NoMethodError
-		_make_event_handler
-		retry
 	end
 	
 	# Passes the given event to the object's event handler.
 	def handle( event )
+		_make_event_handler if @event_handler.nil?
 		@event_handler.handle( event )
-	rescue NoMethodError
-		_make_event_handler
-		retry
 	end
 	
 	# Returns true if the object's event handler includes the given
 	# EventHook instance. 
 	def has_hook?( hook )
+		_make_event_handler if @event_handler.nil?
 		@event_handler.has_hook?( hook )
-	rescue NoMethodError
-		_make_event_handler
-		retry
 	end
 
 
@@ -316,11 +310,9 @@ module Rubygame::EventHandler::HasEventHandler
 	# See also EventHandler#prepend_hook.
 	# 
 	def prepend_hook( hook )
+		_make_event_handler if @event_handler.nil?
 		hook = _prepare_hook( hook )
 		@event_handler.prepend_hook( hook )
-	rescue NoMethodError
-		_make_event_handler
-		retry
 	end
 	
 	# Remove the given EventHook instance from the stack, if it
@@ -331,10 +323,8 @@ module Rubygame::EventHandler::HasEventHandler
 	#           exist on the stack.
 	# 
 	def remove_hook( hook )
+		_make_event_handler if @event_handler.nil?
 		@event_handler.remove_hook( hook )
-	rescue NoMethodError
-		_make_event_handler
-		retry
 	end
 
 	private</diff>
      <filename>lib/rubygame/event_handler.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>2df4cdf7a7c99aa2ab89852ff0dcc429e4459ce5</id>
    </parent>
  </parents>
  <author>
    <name>John Croisant</name>
    <email>jacius@gmail.com</email>
  </author>
  <url>http://github.com/jacius/rubygame/commit/b6ff3710c80b638d3d24445cca6451d2250d3ea2</url>
  <id>b6ff3710c80b638d3d24445cca6451d2250d3ea2</id>
  <committed-date>2009-05-14T17:16:34-07:00</committed-date>
  <authored-date>2009-05-14T16:43:57-07:00</authored-date>
  <message>Fixed HasEventHandler wrongly rescuing NoMethodError.</message>
  <tree>be0cf6b015be5612ec0c1721d814440fe150dd3c</tree>
  <committer>
    <name>John Croisant</name>
    <email>jacius@gmail.com</email>
  </committer>
</commit>
