diff --git a/diylc/diylc-library/src/org/diylc/components/passive/AirCoreInductor.java b/diylc/diylc-library/src/org/diylc/components/passive/AirCoreInductor.java
index 17d6a5ad..6ae8f969 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/AirCoreInductor.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/AirCoreInductor.java
@@ -78,7 +78,7 @@ public class AirCoreInductor extends AbstractLeadedComponent<Inductance> {
 
   @Override
   public String getValueForDisplay() {
-    return getValue().toString();
+    return getValue() == null ? "" : getValue().toString();
   }
 
   public void drawIcon(Graphics2D g2d, int width, int height) {
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java b/diylc/diylc-library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java
index c908fd2d..d2bc08ca 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java
@@ -87,7 +87,7 @@ public class AxialElectrolyticCapacitor extends AbstractLeadedComponent<Capacita
 
   @Override
   public String getValueForDisplay() {
-    return getValue().toString() + (getVoltageNew() == null ? "" : " " + getVoltageNew().toString());
+    return (getValue() == null ? "" : getValue().toString()) + (getVoltageNew() == null ? "" : " " + getVoltageNew().toString());
   }
 
   @Deprecated
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/AxialFilmCapacitor.java b/diylc/diylc-library/src/org/diylc/components/passive/AxialFilmCapacitor.java
index 097928f7..39e08ffe 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/AxialFilmCapacitor.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/AxialFilmCapacitor.java
@@ -87,7 +87,7 @@ public class AxialFilmCapacitor extends AbstractLeadedComponent<Capacitance> {
 
   @Override
   public String getValueForDisplay() {
-    return getValue().toString() + (getVoltageNew() == null ? "" : " " + getVoltageNew().toString());
+    return (getValue() == null ? "" : getValue().toString()) + (getVoltageNew() == null ? "" : " " + getVoltageNew().toString());
   }
 
   @EditableProperty(name = "Voltage")
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/CapacitorSymbol.java b/diylc/diylc-library/src/org/diylc/components/passive/CapacitorSymbol.java
index 6bfd5d6a..f5c5e48d 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/CapacitorSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/CapacitorSymbol.java
@@ -65,7 +65,7 @@ public class CapacitorSymbol extends AbstractSchematicLeadedSymbol<Capacitance>
 
   @Override
   public String getValueForDisplay() {
-    return getValue().toString() + (getVoltageNew() == null ? "" : " " + getVoltageNew().toString());
+    return (getValue() == null ? "" : getValue().toString()) + (getVoltageNew() == null ? "" : " " + getVoltageNew().toString());
   }
 
   @Deprecated
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/InductorSymbol.java b/diylc/diylc-library/src/org/diylc/components/passive/InductorSymbol.java
index 22652eb6..d3a3f924 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/InductorSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/InductorSymbol.java
@@ -84,7 +84,7 @@ public class InductorSymbol extends AbstractSchematicLeadedSymbol<Inductance> {
 
   @Override
   public String getValueForDisplay() {
-    return getValue().toString() + (getCurrent() == null ? "" : " " + getCurrent().toString());
+    return (getValue() == null ? "" : getValue().toString()) + (getCurrent() == null ? "" : " " + getCurrent().toString());
   }
 
   public void drawIcon(Graphics2D g2d, int width, int height) {
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java b/diylc/diylc-library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java
index 69bd6f7a..ebef6614 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java
@@ -72,7 +72,7 @@ public class RadialCeramicDiskCapacitor extends AbstractRadialComponent<Capacita
 
   @Override
   public String getValueForDisplay() {
-    return getValue().toString() + (getVoltageNew() == null ? "" : " " + getVoltageNew().toString());
+    return (getValue() == null ? "" : getValue().toString()) + (getVoltageNew() == null ? "" : " " + getVoltageNew().toString());
   }
 
   @EditableProperty(name = "Voltage")
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/RadialElectrolytic.java b/diylc/diylc-library/src/org/diylc/components/passive/RadialElectrolytic.java
index a357fc3e..171b8ec3 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/RadialElectrolytic.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/RadialElectrolytic.java
@@ -91,7 +91,7 @@ public class RadialElectrolytic extends AbstractRadialComponent<Capacitance> {
 
   @Override
   public String getValueForDisplay() {
-    return getValue().toString() + (getVoltageNew() == null ? "" : " " + getVoltageNew().toString());
+    return (getValue() == null ? "" : getValue().toString()) + (getVoltageNew() == null ? "" : " " + getVoltageNew().toString());
   }
 
   @Deprecated
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.java b/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.java
index 3c08d873..c875ec1c 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/RadialFilmCapacitor.java
@@ -72,7 +72,7 @@ public class RadialFilmCapacitor extends AbstractRadialComponent<Capacitance> {
 
   @Override
   public String getValueForDisplay() {
-    return getValue().toString() + (getVoltageNew() == null ? "" : " " + getVoltageNew().toString());
+    return (getValue() == null ? "" : getValue().toString()) + (getVoltageNew() == null ? "" : " " + getVoltageNew().toString());
   }
 
   @Deprecated
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/Resistor.java b/diylc/diylc-library/src/org/diylc/components/passive/Resistor.java
index d79bf85f..9784b97b 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/Resistor.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/Resistor.java
@@ -86,7 +86,7 @@ public class Resistor extends AbstractLeadedComponent<Resistance> {
 
   @Override
   public String getValueForDisplay() {
-    return getValue().toString() + (getPowerNew() == null ? "" : " " + getPowerNew().toString());
+    return (getValue() == null ? "" : getValue().toString()) + (getPowerNew() == null ? "" : " " + getPowerNew().toString());
   }
 
   @Deprecated
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java b/diylc/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java
index f076ca26..ca2bf20f 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java
@@ -64,7 +64,7 @@ public class ResistorSymbol extends AbstractSchematicLeadedSymbol<Resistance> {
 
   @Override
   public String getValueForDisplay() {
-    return getValue().toString() + (getPowerNew() == null ? "" : " " + getPowerNew().toString());
+    return (getValue() == null ? "" : getValue().toString()) + (getPowerNew() == null ? "" : " " + getPowerNew().toString());
   }
 
   @Deprecated
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/TantalumCapacitor.java b/diylc/diylc-library/src/org/diylc/components/passive/TantalumCapacitor.java
index 2a5ad2de..83f31a49 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/TantalumCapacitor.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/TantalumCapacitor.java
@@ -87,7 +87,7 @@ public class TantalumCapacitor extends AbstractRadialComponent<Capacitance> {
 
   @Override
   public String getValueForDisplay() {
-    return getValue().toString() + (getVoltageNew() == null ? "" : " " + getVoltageNew().toString());
+    return (getValue() == null ? "" : getValue().toString()) + (getVoltageNew() == null ? "" : " " + getVoltageNew().toString());
   }
 
   @EditableProperty(name = "Voltage")