diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index ff0f82a..e03af48 100644
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -661,10 +661,9 @@ _gnutls_io_check_recv (gnutls_session_t session, unsigned int ms)
   reset_errno (session);
 
   ret = session->internals.pull_timeout_func(fd, ms);
-
-  err = get_errno (session);
   if (ret == -1)
     {
+      err = get_errno (session);
       _gnutls_read_log ("READ_TIMEOUT: %d returned from %p, errno=%d (timeout: %u)\n",
 			(int) ret, fd, err, ms);
       return errno_to_gerr(err);
diff --git a/lib/system.c b/lib/system.c
index 14bd085..067f189 100644
--- a/lib/system.c
+++ b/lib/system.c
@@ -125,7 +125,7 @@ int system_recv_timeout(gnutls_transport_ptr_t ptr, unsigned int ms)
 {
 fd_set rfds;
 struct timeval tv;
-int ret, ret2;
+int ret;
 int fd = GNUTLS_POINTER_TO_INT(ptr);
 
   FD_ZERO(&rfds);
@@ -144,10 +144,6 @@ int fd = GNUTLS_POINTER_TO_INT(ptr);
   if (ret <= 0)
     return ret;
 
-  ret2 = recv(fd, NULL, 0, MSG_PEEK);
-  if (ret2 == -1)
-    return ret2;
-      
   return ret;
 }