diff --git a/openssh-6.6p1-set_remote_ipaddr.patch b/openssh-6.6p1-set_remote_ipaddr.patch
index ec4e416..14ff48c 100644
--- a/openssh-6.6p1-set_remote_ipaddr.patch
+++ b/openssh-6.6p1-set_remote_ipaddr.patch
@@ -9,7 +9,7 @@ diff -up openssh-6.8p1/canohost.c.set_remote_ipaddr openssh-6.8p1/canohost.c
 +	if (canonical_host_ip != NULL)
 +		free(canonical_host_ip);
 +
-+	if (packet_connection_is_on_socket()) {
++	if (active_state != NULL && packet_connection_is_on_socket()) {
 +		canonical_host_ip =
 +		    get_peer_ipaddr(packet_get_connection_in());
 +		if (canonical_host_ip == NULL)
diff --git a/openssh-6.7p1-audit.patch b/openssh-6.7p1-audit.patch
index 213ca67..614604e 100644
--- a/openssh-6.7p1-audit.patch
+++ b/openssh-6.7p1-audit.patch
@@ -456,7 +456,7 @@ diff -up openssh-6.8p1/audit-linux.c.audit openssh-6.8p1/audit-linux.c
 +	}
 +	audit_ok = audit_log_user_message(audit_fd, AUDIT_CRYPTO_KEY_USER,
 +			buf, NULL,
-+			listening_for_clients() ? get_remote_ipaddr() : NULL,
++			listening_for_clients() ? NULL : get_remote_ipaddr(),
 +			NULL, 1);
 +	audit_close(audit_fd);
 +	/* do not abort if the error is EPERM and sshd is run as non root user */