diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml
index 5aa1e9eb..71a784bb 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/update.xml
+++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml
@@ -3489,6 +3489,10 @@
 				<org.diylc.appframework.update.Change>
 					<changeType>IMPROVEMENT</changeType>
 					<description>Improved code robustness</description>
+				</org.diylc.appframework.update.Change>	
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Auto-Wrap Label crashes the application if it's shrunken into zero-length</description>
 				</org.diylc.appframework.update.Change>			
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
diff --git a/diylc/diylc-library/src/org/diylc/awt/StringUtils.java b/diylc/diylc-library/src/org/diylc/awt/StringUtils.java
index bc44924b..befb6440 100644
--- a/diylc/diylc-library/src/org/diylc/awt/StringUtils.java
+++ b/diylc/diylc-library/src/org/diylc/awt/StringUtils.java
@@ -112,6 +112,12 @@ public class StringUtils {
       }
       if (pos == -1)
         pos = guess; // Split in the middle of the word
+      
+      // if we couldn't find a match, expand maxWidth
+      if (pos <= 0) {
+        maxWidth++;
+        continue;
+      }
 
       list.add(line.substring(0, pos).trim());
       line = line.substring(pos).trim();