From 3ff71f26b7c2734cb5b5ec7a66221d691ab89b78 Mon Sep 17 00:00:00 2001
From: Aditya Kulkarni <zcash@adityapk.com>
Date: Sun, 8 Sep 2019 21:17:54 -0700
Subject: [PATCH] Clean errors

---
 rust-lightclient/src/lightclient.rs | 2 +-
 rust-lightclient/src/main.rs        | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/rust-lightclient/src/lightclient.rs b/rust-lightclient/src/lightclient.rs
index 7697c0d..2670309 100644
--- a/rust-lightclient/src/lightclient.rs
+++ b/rust-lightclient/src/lightclient.rs
@@ -45,7 +45,7 @@ impl LightClient {
             // Make sure that if a wallet exists, there is no seed phrase being attempted
             if !seed_phrase.is_none() {
                 return Err(io::Error::new(io::ErrorKind::AlreadyExists,
-                    "Cannot restore from seed, because a wallet already exists"));
+                    "Cannot create a new wallet from seed, because a wallet already exists"));
             }
 
             let mut file_buffer = BufReader::new(File::open("wallet.dat")?);
diff --git a/rust-lightclient/src/main.rs b/rust-lightclient/src/main.rs
index 1eeb43c..84c5add 100644
--- a/rust-lightclient/src/main.rs
+++ b/rust-lightclient/src/main.rs
@@ -28,7 +28,13 @@ pub fn main() {
                         .takes_value(true))
                     .get_matches();
 
-    let mut lightclient = LightClient::new(matches.value_of("seed")).unwrap();
+    let mut lightclient = match LightClient::new(matches.value_of("seed")) {
+        Ok(lc) => lc,
+        Err(e) => { 
+            eprintln!("Failed to start wallet. Error was:\n{}", e);
+            return;
+        }
+    };
 
     println!("Starting Light Client");