From 46eea85022b3f63a8bee47d474005c957138799d Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Thu, 6 Jun 2019 14:47:37 -0700
Subject: [PATCH] Improve error message

---
 validator/src/main.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/validator/src/main.rs b/validator/src/main.rs
index 01ac652436..8dd035aa5f 100644
--- a/validator/src/main.rs
+++ b/validator/src/main.rs
@@ -235,7 +235,10 @@ fn main() {
     let cluster_entrypoint = matches.value_of("entrypoint").map(|entrypoint| {
         let entrypoint_addr = solana_netutil::parse_host_port(entrypoint)
             .expect("failed to parse entrypoint address");
-        gossip_addr.set_ip(solana_netutil::get_public_ip_addr(&entrypoint_addr).unwrap());
+        let ip_addr = solana_netutil::get_public_ip_addr(&entrypoint_addr).unwrap_or_else(|err| {
+            panic!("Unable to contact entrypoint {}: {}", entrypoint_addr, err)
+        });
+        gossip_addr.set_ip(ip_addr);
 
         ContactInfo::new_gossip_entry_point(&entrypoint_addr)
     });