diff --git a/core-java-modules/core-java-jar/src/main/java/com/baeldung/jar/MySampleGUIAppn.java b/core-java-modules/core-java-jar/src/main/java/com/baeldung/jar/MySampleGUIAppn.java
index 2be8cef717..95f3fff2a3 100644
--- a/core-java-modules/core-java-jar/src/main/java/com/baeldung/jar/MySampleGUIAppn.java
+++ b/core-java-modules/core-java-jar/src/main/java/com/baeldung/jar/MySampleGUIAppn.java
@@ -7,20 +7,24 @@ import javax.swing.*;
 
 public class MySampleGUIAppn extends JFrame{
     public  MySampleGUIAppn() {
-        setSize(300,300);
-        setTitle("MySampleGUIAppn");
-        Button b = new Button("Click Me!");
-        b.setBounds(30,100,80,30);
-        add(b);
         if (!GraphicsEnvironment.isHeadless()) {
+            setSize(300,300);
+            setTitle("MySampleGUIAppn");
+            Button b = new Button("Click Me!");
+            b.setBounds(30,100,80,30);
+            add(b);
             setVisible(true);
+            addWindowListener(new WindowAdapter() {
+                public void windowClosing(WindowEvent e) {
+                    dispose();
+                    System.exit(0);
+                }
+            });
+
+        }
+        else {
+            System.exit(0);
         }
-        addWindowListener(new WindowAdapter() {
-            public void windowClosing(WindowEvent e) {
-                dispose();
-                System.exit(0);
-            }
-        });
     }
     public static void main(String[] args) {
         MySampleGUIAppn app=new  MySampleGUIAppn();
diff --git a/core-java-modules/core-java-jar/src/test/java/com/baeldung/jar/MySampleGUIAppnUnitTest.java b/core-java-modules/core-java-jar/src/test/java/com/baeldung/jar/MySampleGUIAppnUnitTest.java
index 5842a2042c..ba44f24685 100644
--- a/core-java-modules/core-java-jar/src/test/java/com/baeldung/jar/MySampleGUIAppnUnitTest.java
+++ b/core-java-modules/core-java-jar/src/test/java/com/baeldung/jar/MySampleGUIAppnUnitTest.java
@@ -8,7 +8,7 @@ class MySampleGUIAppnUnitTest {
 
     @Test
     void testMain() throws IOException {
-        System.setProperty("java.awt.headless", "true");
+        System.setProperty("java.awt.headless", "false");
         MySampleGUIAppn instance = new MySampleGUIAppn();
         String [] args = null;
         System.exit(0);