diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml
index 6b8838c6..9fee9a08 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/update.xml
+++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml
@@ -4189,6 +4189,10 @@
 				<org.diylc.appframework.update.Change>
 					<changeType>BUG_FIX</changeType>
 					<description>Do not apply any user-default property values when creating a standard datasheet model (e.g. a capacitor)</description>
+				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Variants of boards having explicit sizing mode fail when trying to add to a project</description>
 				</org.diylc.appframework.update.Change>				
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 09d04dd0..2754ec2f 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/components/boards/AbstractBoard.java b/diylc/diylc-library/src/org/diylc/components/boards/AbstractBoard.java
index 2339e707..c0674aec 100644
--- a/diylc/diylc-library/src/org/diylc/components/boards/AbstractBoard.java
+++ b/diylc/diylc-library/src/org/diylc/components/boards/AbstractBoard.java
@@ -325,10 +325,11 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
   }
 
   public void setLength(Size length) {
-    if (getMode() == BoardSizingMode.Explicit) {
-      setControlPoint(firstPoint, 0);
-      Point2D second = new Point2D.Double(firstPoint.getX() + length.convertToPixels(), firstPoint.getY() + width.convertToPixels());
-      setControlPoint(second, 1);
+    if (getMode() == BoardSizingMode.Explicit && length != null && width != null) {
+      setControlPoint(firstPoint, 0);      
+      Point2D second = new Point2D.Double(firstPoint.getX() + length.convertToPixels(),
+          firstPoint.getY() + width.convertToPixels());
+      setControlPoint(second, 1);    
     }
     this.length = length;    
   }
@@ -343,7 +344,7 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
   }
 
   public void setWidth(Size width) {
-    if (getMode() == BoardSizingMode.Explicit) {
+    if (getMode() == BoardSizingMode.Explicit && length != null && width != null) {
       setControlPoint(firstPoint, 0);
       Point2D second = new Point2D.Double(firstPoint.getX() + length.convertToPixels(), firstPoint.getY() + width.convertToPixels());
       setControlPoint(second, 1);
diff --git a/diylc/diylc-swing/tools/DIYLCStarter.launch b/diylc/diylc-swing/DIYLCStarter.launch
similarity index 100%
rename from diylc/diylc-swing/tools/DIYLCStarter.launch
rename to diylc/diylc-swing/DIYLCStarter.launch
diff --git a/diylc/diylc-swing/tools/RegressionTestRunner.launch b/diylc/diylc-swing/RegressionTestRunner.launch
similarity index 100%
rename from diylc/diylc-swing/tools/RegressionTestRunner.launch
rename to diylc/diylc-swing/RegressionTestRunner.launch
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index 09d04dd0..2754ec2f 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 c62468aa..910a532b 100644
Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ