diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2f66c83065..f572490162 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,21 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-04-24 13:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * src/rtl/achoice.prg
+    ! REVERTED: Fixed typo in ACHOICE() K_UP handling, which caused a
+      bogus line to appear below the bottom when the height of the
+      achoice area was only one line. Pls verify me for regressions.
+      [ It did cause regression. So now the original bug is present
+      again. ]
+      TOFIX: ---
+             #include "inkey.ch"
+             CLS
+             hb_keyPut( K_DOWN )
+             hb_keyPut( K_UP ) /* bogus '2' appears out of the area here. */
+             AChoice( 0, 0, 0, 0, { "1", "2" } )
+             ---
+
 2010-04-24 10:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   + examples/ps32
   + examples/ps32/ps32.hbp
diff --git a/harbour/contrib/hbnetio/netiomt.prg b/harbour/contrib/hbnetio/netiomt.prg
index 2915f42f35..8bf948b1a7 100644
--- a/harbour/contrib/hbnetio/netiomt.prg
+++ b/harbour/contrib/hbnetio/netiomt.prg
@@ -58,8 +58,11 @@
  *
  */
 
+#include "error.ch"
+
 FUNCTION NETIO_MTSERVER( nPort, cIfAddr, cRootDir, xRPC, ... )
    LOCAL pListenSocket, lRPC
+   LOCAL oError
 
    IF hb_mtvm()
       SWITCH ValType( xRPC )
@@ -76,6 +79,20 @@ FUNCTION NETIO_MTSERVER( nPort, cIfAddr, cRootDir, xRPC, ... )
       IF !Empty( pListenSocket )
          hb_threadDetach( hb_threadStart( @netio_srvloop(), pListenSocket, xRPC, ... ) )
       ENDIF
+   ELSE
+      oError := ErrorNew()
+
+      oError:severity    := ES_ERROR
+      oError:genCode     := EG_UNSUPPORTED
+      oError:subSystem   := "HBNETIO"
+      oError:subCode     := 0
+      oError:description := hb_LangErrMsg( EG_UNSUPPORTED )
+      oError:canRetry    := .F.
+      oError:canDefault  := .F.
+      oError:fileName    := ""
+      oError:osCode      := 0
+
+      Eval( ErrorBlock(), oError )
    ENDIF
    RETURN pListenSocket
 
diff --git a/harbour/src/rtl/achoice.prg b/harbour/src/rtl/achoice.prg
index 92369847b7..f7c2c9a6ef 100644
--- a/harbour/src/rtl/achoice.prg
+++ b/harbour/src/rtl/achoice.prg
@@ -226,7 +226,7 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo
                DispLine( acItems[ nPos ], nTop + ( nPos - nAtTop ), nLeft, Ach_Select( alSelect, nPos ), .F., nNumCols )
                hb_scroll( nTop, nLeft, nBottom, nRight, ( nNewPos - ( nAtTop + nNumRows - 1 ) ) )
                nAtTop := nNewPos
-               nPos   := Min( nPos, nAtTop + nNumRows - 1 )
+               nPos   := Max( nPos, nAtTop + nNumRows - 1 )
                DO WHILE nPos > nNewPos
                   DispLine( acItems[ nPos ], nTop + ( nPos - nAtTop ), nLeft, Ach_Select( alSelect, nPos ), .F., nNumCols )
                   nPos--