diff --git a/ChangeLog b/ChangeLog
index de69f055f..5b74856b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-15  Alexey Shchepin  <alexey@sevcom.net>
+
+	* src/jlib.erl: Bugfix
+
 2005-09-10  Alexey Shchepin  <alexey@sevcom.net>
 
 	* src/ejd2odbc.erl: Updated
diff --git a/src/jlib.erl b/src/jlib.erl
index ffd4e51d9..5de126ee8 100644
--- a/src/jlib.erl
+++ b/src/jlib.erl
@@ -219,8 +219,7 @@ jid_to_string({Node, Server, Resource}) ->
 is_nodename([]) ->
     false;
 is_nodename(J) ->
-    nodeprep(J).
-
+    nodeprep(J) /= error.
 
 
 %tolower_c(C) when C >= $A, C =< $Z ->