diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01c722ed8..8ac3cbc84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,9 @@ All notable changes to this project will be documented in this file.
 - Warning before switching auto rename identifiers on
 
 ### Fixed
-- [#1904] NullpointerException when renaming invalid identifiers in AS1/2 files caused by missing charset
-- [#1904] NullpointerException when fast switching items
+- [#1904] NullPointerException when renaming invalid identifiers in AS1/2 files caused by missing charset
+- [#1904] NullPointerException when fast switching items
+- [#1904] NullPointerException on ErrorLog frame
 
 ### Changed
 - Warning before switching deobfuscation is now optional
diff --git a/src/com/jpexs/decompiler/flash/gui/ErrorLogFrame.java b/src/com/jpexs/decompiler/flash/gui/ErrorLogFrame.java
index d22378ca4..f0dd0cebc 100644
--- a/src/com/jpexs/decompiler/flash/gui/ErrorLogFrame.java
+++ b/src/com/jpexs/decompiler/flash/gui/ErrorLogFrame.java
@@ -314,7 +314,9 @@ public class ErrorLogFrame extends AppFrame {
                     scrollPane.setVisible(false);
                 }
                 pan.setAlignmentX(0f);
-                logViewInner.add(pan);
+                if (logViewInner != null) { //may be disposed or what? #1904
+                    logViewInner.add(pan);
+                }
                 revalidate();
                 repaint();
             });