diff --git a/ChangeLog b/ChangeLog
index 10c8a1ad7..a21fdd427 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-08  Alexey Shchepin  <alexey@sevcom.net>
+
+	* src/ejabberd_c2s.erl: Bugfix
+
 2006-12-05  Alexey Shchepin  <alexey@sevcom.net>
 
 	* src/mod_roster_odbc.erl: Better error handling
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 9adbce5c9..0865fba5b 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -312,6 +312,14 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
 	    {stop, normal, StateData}
     end;
 
+wait_for_stream({xmlstreamelement, _}, StateData) ->
+    send_text(StateData, ?INVALID_XML_ERR ++ ?STREAM_TRAILER),
+    {stop, normal, StateData};
+
+wait_for_stream({xmlstreamend, _}, StateData) ->
+    send_text(StateData, ?INVALID_XML_ERR ++ ?STREAM_TRAILER),
+    {stop, normal, StateData};
+
 wait_for_stream({xmlstreamerror, _}, StateData) ->
     Header = io_lib:format(?STREAM_HEADER,
 			   ["none", ?MYNAME, " version='1.0'", ""]),