diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml
index 7e084a10..c0f49064 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/update.xml
+++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml
@@ -4458,6 +4458,10 @@
 					<changeType>IMPROVEMENT</changeType>
 					<description>Added 1-pole DIP switch option</description>
 				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Allow guitar wiring analyzer when some of the switching configuration do not produce output</description>
+				</org.diylc.appframework.update.Change>
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>
diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 2a633017..847ef203 100644
Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ
diff --git a/diylc/diylc-library/src/org/diylc/netlist/GuitarDiagramAnalyzer.java b/diylc/diylc-library/src/org/diylc/netlist/GuitarDiagramAnalyzer.java
index 5827f814..0caed2ac 100644
--- a/diylc/diylc-library/src/org/diylc/netlist/GuitarDiagramAnalyzer.java
+++ b/diylc/diylc-library/src/org/diylc/netlist/GuitarDiagramAnalyzer.java
@@ -109,6 +109,10 @@ public class GuitarDiagramAnalyzer extends NetlistAnalyzer implements INetlistAn
     List<String> notes = new ArrayList<String>();
 
     Tree tree = constructTree(netlist);
+    
+    if (tree == null) {
+      return new Summary(netlist, "No pickups are connected to the output jack");
+    }
 
     Tree pickupTree = tree.filter(PICKUP_TYPES);
 
@@ -405,8 +409,10 @@ public class GuitarDiagramAnalyzer extends NetlistAnalyzer implements INetlistAn
     List<Node> jackSleeveNodes = find(JACK_TYPES, "Sleeve", netlist);
 
     if (jackTipNodes.size() == 0 || jackSleeveNodes.size() == 0) {
-      throw new TreeException("Could not find anything connected to a jack tip terminal.");
-    } else if (jackTipNodes.size() > 1 || jackSleeveNodes.size() > 1) {
+//      LOG.("Could not find anything connected to a jack tip terminal.");
+      return null;
+    } else 
+    if (jackTipNodes.size() > 1 || jackSleeveNodes.size() > 1) {
       throw new TreeException("Multiple jacks found, could not proceed.");
     } else {
       Node jackTip = jackTipNodes.get(0);
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index 2a633017..847ef203 100644
Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ
diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar
index f95652c8..1a0c3809 100644
Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ