diff --git a/src/com/limelight/Limelight.java b/src/com/limelight/Limelight.java
index f333002..77b5c78 100644
--- a/src/com/limelight/Limelight.java
+++ b/src/com/limelight/Limelight.java
@@ -373,13 +373,16 @@ public class Limelight implements NvConnectionListener {
 		Limelight limelight;
 		if (host == null || action.equals("discover")) {
 			limelight = new Limelight();
-			limelight.discover(!action.equals("discover"));
 		} else
 			limelight = new Limelight(host);
 		
 		//Set debugging level
 		limelight.setLevel(debug);
 		
+		if (limelight.host == null) {
+			limelight.discover(!action.equals("discover"));
+		}
+		
 		if (action.equals("stream") || action.equals("fake")) {
 			StreamConfiguration streamConfig = new StreamConfiguration(app, width, height, refresh, bitrate, sops);