diff --git a/ChangeLog.txt b/ChangeLog.txt
index 0bd075c215..1aec7b8977 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,11 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2015-03-02 16:08 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/rtl/hbinet.c
+  * contrib/hbssl/ssl_inet.c
+    ! fixed unfinished code with error code translation - thanks to Abe
+
 2015-02-26 09:36 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/rddads/ads1.c
     * removed unnecessary casting
diff --git a/contrib/hbssl/ssl_inet.c b/contrib/hbssl/ssl_inet.c
index d9e011388c..b3a88a2746 100644
--- a/contrib/hbssl/ssl_inet.c
+++ b/contrib/hbssl/ssl_inet.c
@@ -1,4 +1,3 @@
-/*
  * Harbour Project source code:
  *    SSL encryption for Harbour hb_inet*() connections
  *
@@ -101,7 +100,7 @@ static long hb_inetReadSSL( PHB_ZNETSTREAM pStream, HB_SOCKET sd,
          iToRead = timeout < 0 ? 1 : hb_socketSelectRead( sd, timeout );
          if( iToRead <= 0 )
             pStream->error = iToRead == 0 ?
-                             HB_INET_ERR_TIMEOUT : hb_socketGetError();
+                             HB_SOCKET_ERR_TIMEOUT : hb_socketGetError();
          else
             iToRead = ( int ) len;
       }
diff --git a/src/rtl/hbinet.c b/src/rtl/hbinet.c
index 53917695a4..f7167d86e5 100644
--- a/src/rtl/hbinet.c
+++ b/src/rtl/hbinet.c
@@ -143,20 +143,18 @@ static int s_inetGetError( PHB_SOCKET_STRUCT socket )
 {
    int iError;
 
-   if( socket->errorFunc )
-      iError = socket->errorFunc( socket->stream );
-   else
-   {
-      iError = hb_socketGetError();
-      if( iError == HB_SOCKET_ERR_TIMEOUT )
-         iError = HB_INET_ERR_TIMEOUT;
-   }
+   iError = socket->errorFunc ? socket->errorFunc( socket->stream ) :
+                                hb_socketGetError();
+
+   if( iError == HB_SOCKET_ERR_TIMEOUT )
+      iError = HB_INET_ERR_TIMEOUT;
+
    return iError;
 }
 
 static HB_BOOL s_inetIsTimeout( PHB_SOCKET_STRUCT socket )
 {
-   return s_inetGetError( socket ) == HB_SOCKET_ERR_TIMEOUT;
+   return s_inetGetError( socket ) == HB_INET_ERR_TIMEOUT;
 }
 
 static void hb_inetGetError( PHB_SOCKET_STRUCT socket )