diff --git a/src/mysql_conn.erl b/src/mysql_conn.erl
index a077598..821bcb5 100644
--- a/src/mysql_conn.erl
+++ b/src/mysql_conn.erl
@@ -17,7 +17,7 @@
 %%% Modified: 23 Sep 2006 by Yariv Sadan <yarivvv@gmail.com>
 %%% Added transaction handling and prepared statement execution.
 %%%
-%%% Copyright (c) 2001-2004 Kungliga Tekniska Högskolan
+%%% Copyright (c) 2001-2004 Kungliga Tekniska Högskolan
 %%% See the file COPYING
 %%%
 %%%
diff --git a/src/mysql_recv.erl b/src/mysql_recv.erl
index c1e1173..2d89bb8 100644
--- a/src/mysql_recv.erl
+++ b/src/mysql_recv.erl
@@ -10,7 +10,7 @@
 %%% Note    : All MySQL code was written by Magnus Ahltorp, originally
 %%%           in the file mysql.erl - I just moved it here.
 %%%
-%%% Copyright (c) 2001-2004 Kungliga Tekniska Högskolan
+%%% Copyright (c) 2001-2004 Kungliga Tekniska Högskolan
 %%% See the file COPYING
 %%%
 %%%           Signals this receiver process can send to it's parent
@@ -75,6 +75,7 @@ start_link(Host, Port, LogFun, Parent) when is_list(Host), is_integer(Port) ->
 	spawn_link(fun () ->
 			   init(Host, Port, LogFun, Parent)
 		   end),
+	erlang:monitor(process, RecvPid),
     %% wait for the socket from the spawned pid
     receive
 	{mysql_recv, RecvPid, init, {error, E}} ->