diff --git a/src/emysql_auth.erl b/src/emysql_auth.erl
index d35745ad..5b90b206 100644
--- a/src/emysql_auth.erl
+++ b/src/emysql_auth.erl
@@ -200,5 +200,7 @@ hash([], N1, N2, _Add) ->
     {N1 band Mask , N2 band Mask}.
 
 asciiz(Data) when is_binary(Data) ->
-    [S, R] = binary:split(Data, <<0>>),
-    {S, R}.
+    case binary:split(Data, <<0>>) of
+        [S1, R] -> {S1, R};
+        [S2] -> {S2, <<>>}
+    end.