diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 81c6076..30aa926 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -326,6 +326,13 @@
 	  prefix2str (connected->address, (char *)buf, BUFSIZ);
 	  zlog_warn ("Nonexitant ip address %s removal attempt from \
                       circuit %d", buf, circuit->circuit_id);
+	  zlog_warn ("Current ip addresses on %s:", circuit->interface->name);
+	  for (ALL_LIST_ELEMENTS_RO(circuit->ip_addrs, node, ip))
+	    {
+	      prefix2str((struct prefix*)ip, (char *)buf, BUFSIZ);
+	      zlog_warn("  %s", buf);
+	    }
+	  zlog_warn("End of addresses");
 	}
 
       prefix_ipv4_free (ipv4);
@@ -369,6 +376,19 @@
 	  prefix2str (connected->address, (char *)buf, BUFSIZ);
 	  zlog_warn ("Nonexitant ip address %s removal attempt from \
 		      circuit %d", buf, circuit->circuit_id);
+	  zlog_warn ("Current ip addresses on %s:", circuit->interface->name);
+	  for (ALL_LIST_ELEMENTS_RO(circuit->ipv6_link, node, ip6))
+	    {
+	      prefix2str((struct prefix*)ip6, (char *)buf, BUFSIZ);
+	      zlog_warn("  %s", buf);
+	    }
+	  zlog_warn(" -----");
+	  for (ALL_LIST_ELEMENTS_RO(circuit->ipv6_non_link, node, ip6))
+	    {
+	      prefix2str((struct prefix*)ip6, (char *)buf, BUFSIZ);
+	      zlog_warn("  %s", buf);
+	    }
+	  zlog_warn("End of addresses");
 	}
       else if (circuit->area)
 	  lsp_regenerate_schedule (circuit->area, circuit->is_type, 0);