diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 35ac561a64cedb9f5d1d8a5095e072c93989a043..29b21a36c23a42ab22298f762a13aebbd8f96ae6 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13821,7 +13821,9 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
 			}
 		} else {
 			if ((firststate = ast_extension_state(NULL, p->context, p->exten)) < 0) {
-				ast_log(LOG_ERROR, "Got SUBSCRIBE for extension without hint. Please add hint to %s in context %s\n", p->exten, p->context);
+				char iabuf[INET_ADDRSTRLEN];
+
+				ast_log(LOG_ERROR, "Got SUBSCRIBE for extension %s@%s from %s, but there is no hint for that extension\n", p->exten, p->context, ast_inet_ntoa(iabuf, sizeof(iabuf), p->sa.sin_addr));
 				transmit_response(p, "404 Not found", req);
 				ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);	
 				return 0;