diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 74bbedc2f6..49dacfb3ab 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2004-02-15 03:42 UTC+0100 Viktor Szakats <viktor.szakats@syenar.hu>
+
+   * source/rdd/dbcmd.c
+     ! FIELDPUT() Fixed to accept and ignore field NIL values 
+       without runtime error. C52 compatible.
+
 2004-02-14 19:14 UTC+0100 Viktor Szakats <viktor.szakats@syenar.hu>
 
    * source/rtl/tbrowse.prg
diff --git a/harbour/include/hbapigt.h b/harbour/include/hbapigt.h
index 6a719b66dc..6211e3f840 100644
--- a/harbour/include/hbapigt.h
+++ b/harbour/include/hbapigt.h
@@ -284,7 +284,7 @@ extern int    hb_inkeyNext( HB_inkey_enum event_mask );           /* Return the
 extern void   hb_inkeyPoll( void );           /* Poll the console keyboard to stuff the Harbour buffer */
 extern void   hb_inkeyReset( BOOL allocate ); /* Reset the Harbour keyboard buffer */
 extern int    hb_inkeyTranslate( int key, HB_inkey_enum event_make ); /* Translation extended codes to normal codes, if needed */
-extern void	  hb_inkeySetCancelKeys( int CancelKey, int CancelKeyEx ); /* Set keycodes for Cancel key (usually K_ALT_C) */
+extern void   hb_inkeySetCancelKeys( int CancelKey, int CancelKeyEx ); /* Set keycodes for Cancel key (usually K_ALT_C) */
 
 /* Mouse related declarations */
 
diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c
index bf99ff19ef..fa36e2be5d 100644
--- a/harbour/source/rdd/dbcmd.c
+++ b/harbour/source/rdd/dbcmd.c
@@ -2231,7 +2231,7 @@ HB_FUNC( FIELDPUT )
    if( s_pCurrArea && uiIndex )
    {
       pItem = hb_param( 2, HB_IT_ANY );
-      if( SELF_PUTVALUE( ( AREAP ) s_pCurrArea->pArea, uiIndex, pItem ) == SUCCESS )
+      if( ! HB_IS_NIL( pItem ) && ( SELF_PUTVALUE( ( AREAP ) s_pCurrArea->pArea, uiIndex, pItem ) == SUCCESS ) )
          hb_itemReturn( pItem );
    }
 }