diff --git a/gradle.properties b/gradle.properties
index 23bbd3f86..59e7d51ad 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=4.4.0
+version=4.4.1
 group=org.openmbee.magicdraw.mdk
 descriptorFile=MDR_Plugin_Model_Development_Kit_91110_descriptor.xml
 magicdDrawGroupName=gov.nasa.jpl.cae.magicdraw.mdk
diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/util/MDUtils.java b/src/main/java/gov/nasa/jpl/mbee/mdk/util/MDUtils.java
index 0de8fff73..04fcf67df 100644
--- a/src/main/java/gov/nasa/jpl/mbee/mdk/util/MDUtils.java
+++ b/src/main/java/gov/nasa/jpl/mbee/mdk/util/MDUtils.java
@@ -213,7 +213,12 @@ public static void exportSVG(File svgFile, DiagramPresentationElement diagramPre
             Transformer transformer = transformerFactory.newTransformer();
             transformer.transform(source, result);
         } finally {
-            System.setProperty(SVG_ENRICHED_EXPORT_PROPERTY_NAME, originalSvgEnrichedExportPropertyValue);
+            if (originalSvgEnrichedExportPropertyValue != null) {
+                System.setProperty(SVG_ENRICHED_EXPORT_PROPERTY_NAME, originalSvgEnrichedExportPropertyValue);
+            }
+            else {
+                System.clearProperty(SVG_ENRICHED_EXPORT_PROPERTY_NAME);
+            }
         }
     }