diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0de0951c..eb575661 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,7 +34,7 @@ The git repositories are hosted at the following sites:
 ### Fixed
 
 * Fixed network port object to accept host name option of host-n-port
-  writes. (#997)
+  writes. (#997) (#1001)
 * Fixed missing exports in bacnet/basic header files. (#996)
 * Fixed NDPU comparison functions that were missing segment-ack PDU. (#991)
 * Fixed WriteProperty NULL bypass which is only for present-value property
diff --git a/src/bacnet/basic/object/netport.c b/src/bacnet/basic/object/netport.c
index fb520d1c..f0fea92e 100644
--- a/src/bacnet/basic/object/netport.c
+++ b/src/bacnet/basic/object/netport.c
@@ -4197,11 +4197,6 @@ bool Network_Port_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
         wp_data->error_code = ERROR_CODE_INVALID_DATA_TYPE;
     }
 
-    if (!status && (wp_data->error_code == ERROR_CODE_OTHER)) {
-        wp_data->error_class = ERROR_CLASS_PROPERTY;
-        wp_data->error_code = ERROR_CODE_INVALID_DATA_TYPE;
-    }
-
     return status;
 }