diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1078c35349..0385cc6049 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,9 @@
+19990818-19:20 EDT David G. Holm <dholm@jsd-llc.com>
+  * source/vm/hvm.c
+    * Added TODO: comment to indicate that the divide by zero check
+      needs to be removed once proper divide by zero error handling
+      has been added to Harbour.
+
 19990818-18:45 EDT David G. Holm <dholm@jsd-llc.com>
   * config/os2/icc.cf
     ! Fix to only use RDD libraries when RDD library is specified.
diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c
index e0223bd6e6..12c032e59a 100644
--- a/harbour/source/vm/hvm.c
+++ b/harbour/source/vm/hvm.c
@@ -821,10 +821,8 @@ void hb_vmDivide( void )
    double d2 = hb_vmPopDouble( &wDec2 );
    double d1 = hb_vmPopDouble( &wDec1 );
 
-   /* NOTE: Clipper always returns the result of a division
-            with the SET number of decimal places, unless the
-            divisor is zero, in which case the result is zero
-            with zero decimal places. */
+   /* TODO: Remove the if zero, return zero code once the proper
+            error handling for divide by zero has been added. */
    if( d2 == 0.0 )
       hb_vmPushInteger( 0 );
    else