diff --git a/src/jid.erl b/src/jid.erl
index cc387ecbe..7bdd652ae 100644
--- a/src/jid.erl
+++ b/src/jid.erl
@@ -87,9 +87,13 @@ split(#jid{user = U, server = S, resource = R}) ->
 split(_) ->
     error.
 
--spec from_string(binary()) -> jid() | error.
-
-from_string(S) ->
+-spec from_string([binary()|string()]) -> jid() | error.
+from_string(S) when is_list(S) ->
+    %% We do not accept list because we want to enforce good practice of
+    %% using binaries for string. However, we do not let it crash to avoid
+    %% losing associated ets table.
+    {error, need_jid_as_binary};
+from_string(S) when is_binary(S) ->
     SplitPattern = ets:lookup_element(jlib, string_to_jid_pattern, 2),
     Size = size(S),
     End = Size-1,
diff --git a/test/jid_test.exs b/test/jid_test.exs
new file mode 100644
index 000000000..b75a3603a
--- /dev/null
+++ b/test/jid_test.exs
@@ -0,0 +1,44 @@
+# ----------------------------------------------------------------------
+#
+# ejabberd, Copyright (C) 2002-2016   ProcessOne
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# ----------------------------------------------------------------------
+
+defmodule JidTest do
+  @author "mremond@process-one.net"
+
+  use ExUnit.Case, async: true
+
+  require Record
+  Record.defrecord :jid, Record.extract(:jid, from_lib: "ejabberd/include/jlib.hrl")
+
+  setup_all do
+    :stringprep.start
+    :jid.start
+  end
+
+  test "create a jid from a binary" do
+    jid = :jid.from_string("test@localhost/resource")
+    assert jid(jid, :user) == "test"
+    assert jid(jid, :server) == "localhost"
+    assert jid(jid, :resource) == "resource"
+  end
+
+  test "Check that sending a list to from_string/1 does not crash the jid process" do
+    {:error, :need_jid_as_binary} = :jid.from_string('test@localhost/resource')
+  end
+end