--- libaitrpc/src/aitrpc.c	2013/11/14 22:53:12	1.12.4.3
+++ libaitrpc/src/aitrpc.c	2013/11/15 08:48:04	1.12.4.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.c,v 1.12.4.3 2013/11/14 22:53:12 misho Exp $
+* $Id: aitrpc.c,v 1.12.4.4 2013/11/15 08:48:04 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -176,8 +176,9 @@ rpc_Read(int sock, int type, int flags, sockaddr_t * _
 			ret = recv(sock, buf, len, flags);
 		else {
 			ret = recvfrom(sock, buf, len, flags, &sa2.sa, &salen);
-			if (ret > -1 && e_addrcmp(sa, &sa2, 42)) {
-				rpc_SetErr(ERPCMISMATCH, "Received RPC response from unknown address");
+			if (ret > -1 && sa && e_addrcmp(sa, &sa2, 42)) {
+				rpc_SetErr(ERPCMISMATCH, 
+						"Received RPC response from unknown address");
 				return -1;
 			}
 		}