diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 9eb0ce0c7b8c0219ec71dbabad55134238d3e5d0..53777fc3d7a8728cb42f7eebbac23a119af358cc 100644
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -214,6 +214,8 @@ get_addresses(const char *host, in_port_t port) {
 	isc_result_t result;
 	int found = 0, count;
 
+	REQUIRE(host != NULL);
+
 	if (*host == '/') {
 		result = isc_sockaddr_frompath(&serveraddrs[nserveraddrs],
 					       host);
@@ -944,8 +946,9 @@ main(int argc, char **argv) {
 	if (strcmp(command, "restart") == 0)
 		fatal("'%s' is not implemented", command);
 
-	if (nserveraddrs == 0)
+	if (nserveraddrs == 0 && servername != NULL) {
 		get_addresses(servername, (in_port_t) remoteport);
+	}
 
 	DO("post event", isc_app_onrun(rndc_mctx, task, rndc_start, NULL));
 
diff --git a/bin/tests/optional/byname_test.c b/bin/tests/optional/byname_test.c
index 4b255baad1d80920520120f5f9485a776fb326a3..4874d7ffb1f3ae976c1750f0b8195a2c955e38e9 100644
--- a/bin/tests/optional/byname_test.c
+++ b/bin/tests/optional/byname_test.c
@@ -318,6 +318,7 @@ main(int argc, char *argv[]) {
 		isc_sockaddr_fromin(&sa, &ina, 53);
 		ISC_LIST_APPEND(sal, &sa, link);
 
+		REQUIRE(DNS_VIEW_VALID(view));
 		RUNTIME_CHECK(dns_fwdtable_add(view->fwdtable, dns_rootname,
 					       &sal, dns_fwdpolicy_only)
 			      == ISC_R_SUCCESS);