diff --git a/CHANGES b/CHANGES
index 1c51ccb63b..40dfa50038 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1050.	[bug]		Log messages reporting malformed IP addresses in
+			address lists such as that of the forwarders option
+			failed to include the correct error code, file
+			name, and line number. [RT #1890]
+
 1049.	[func]		pid-file "none"; will disable writing a pid file.
 			[RT #1848]
 
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 7a85f7e08e..8a3919a543 100644
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: parser.c,v 1.78 2001/10/08 07:46:04 marka Exp $ */
+/* $Id: parser.c,v 1.79 2001/10/12 22:00:31 gson Exp $ */
 
 #include <config.h>
 
@@ -2784,14 +2784,16 @@ token_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) {
 			}
 		}
 	}
-	return (ISC_R_NOTFOUND); /* XXX */
+	return (ISC_R_UNEXPECTEDTOKEN);
 }
 
 static isc_result_t
 get_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) {
 	isc_result_t result;
 	CHECK(cfg_gettoken(pctx, 0));
-	CHECK(token_addr(pctx, flags, na));
+	result = token_addr(pctx, flags, na);
+	if (result == ISC_R_UNEXPECTEDTOKEN)
+		parser_error(pctx, LOG_NEAR, "expected IP address");
  cleanup:
 	return (result);
 }
@@ -2947,7 +2949,6 @@ parse_netaddr(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
 	*ret = obj;
 	return (ISC_R_SUCCESS);
  cleanup:
-	parser_error(pctx, LOG_NEAR, "expected IP address");
 	CLEANUP_OBJ(obj);
 	return (result);
 }