diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 48682de9db2c1dba9a2b9255677df96ce28eabc8..63dabad24afe32fc66edde7bf6b13375c9bdff38 100644
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -249,6 +249,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);
@@ -990,8 +992,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 c48baec0bd1deb1083ae687b0cfc6935fae49502..f515218f476c9c73a873f94d2a8299d72b6125c7 100644
--- a/bin/tests/optional/byname_test.c
+++ b/bin/tests/optional/byname_test.c
@@ -312,6 +312,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);