diff --git a/convex-cli/src/main/java/convex/cli/key/KeyGenerate.java b/convex-cli/src/main/java/convex/cli/key/KeyGenerate.java
index b35b99be0..02fb33893 100644
--- a/convex-cli/src/main/java/convex/cli/key/KeyGenerate.java
+++ b/convex-cli/src/main/java/convex/cli/key/KeyGenerate.java
@@ -1,16 +1,12 @@
 package convex.cli.key;
 
-import java.io.Console;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
-import java.security.NoSuchAlgorithmException;
-import java.security.spec.InvalidKeySpecException;
 import java.util.Arrays;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import convex.cli.CLIError;
 import convex.cli.Constants;
 import convex.core.crypto.AKeyPair;
 import convex.core.crypto.BIP39;
diff --git a/convex-cli/src/main/java/convex/cli/local/LocalStart.java b/convex-cli/src/main/java/convex/cli/local/LocalStart.java
index 17c738815..162f758c8 100644
--- a/convex-cli/src/main/java/convex/cli/local/LocalStart.java
+++ b/convex-cli/src/main/java/convex/cli/local/LocalStart.java
@@ -8,6 +8,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import convex.cli.CLIError;
 import convex.cli.Constants;
 import convex.cli.Helpers;
 import convex.cli.Main;
@@ -67,7 +68,7 @@ public class LocalStart implements Runnable {
      * @return List of distinct public keys
      */
     private List<AKeyPair> getPeerKeyPairs(int n) {
-    	HashSet<AKeyPair> keyPairList = new HashSet<AKeyPair>();
+    	ArrayList<AKeyPair> keyPairList = new ArrayList<AKeyPair>();
     	
     	Main mainParent = localParent.cli();
       
@@ -95,6 +96,10 @@ private List<AKeyPair> getPeerKeyPairs(int n) {
 			}
 		}
 		
+		if (new HashSet<>(keyPairList).size()<keyPairList.size()) {
+			throw new CLIError("Duplicate peer keys provided!");
+		}
+		
 		return new ArrayList<AKeyPair>(keyPairList);
     }