diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/TomlConfigurationStorage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/TomlConfigurationStorage.java
index 9794e260d..84d2cf25c 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/TomlConfigurationStorage.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/TomlConfigurationStorage.java
@@ -545,7 +545,7 @@ public class TomlConfigurationStorage implements ConfigurationStorage {
                     if (showComments) {
                         pw.println();
                     }
-                    if (!item.hasValue || savedValue.isEmpty()) {
+                    if (!item.hasValue || savedValue == null || savedValue.isEmpty()) {
                         pw.print("# ");
                     }
                     pw.print(key + " = ");