diff --git a/ChangeLog b/ChangeLog
index 3c7fd187a..17685cbf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
 	src/mod_vcard_odbc.erl, src/mod_private_odbc.erl, src/jd2ejd.erl:
 	Update Exmpp XML parser options.
 
+	* src/gen_iq_handler.erl: Add the module and function names to the
+	error message, when a module crash.
+
 2008-12-03  Jean-Sébastien Pédron  <js.pedron@meetic-corp.com>
 
 	* src/mod_proxy65/mod_proxy65_stream.erl,
diff --git a/src/gen_iq_handler.erl b/src/gen_iq_handler.erl
index 0a4de407f..130934ca3 100644
--- a/src/gen_iq_handler.erl
+++ b/src/gen_iq_handler.erl
@@ -124,7 +124,8 @@ process_iq(_Host, Module, Function, From, To, IQ_Rec) ->
 	    ejabberd_router:route(To, From, Reply)
     catch
 	_Class:Reason ->
-	    ?ERROR_MSG("~p~n~p~n", [Reason, erlang:get_stacktrace()])
+	    ?ERROR_MSG("~s:~s/3 crashed: ~p~n~p~n",
+              [Module, Function, Reason, erlang:get_stacktrace()])
     end.
 
 %%====================================================================