diff --git a/src/main/java/org/jcnc/jnotepad/LunchApp.java b/src/main/java/org/jcnc/jnotepad/LunchApp.java
index 8c15be0820b711f0145afd6ec58d85a1cd47a243..36aa0cf6f33609065166775a99d0747599100a11 100644
--- a/src/main/java/org/jcnc/jnotepad/LunchApp.java
+++ b/src/main/java/org/jcnc/jnotepad/LunchApp.java
@@ -56,7 +56,9 @@ public class LunchApp extends Application {
             List<String> rawParameters = getParameters().getRaw();
             threadPool.execute(() -> {
                 TextArea textArea = controller.openAssociatedFileAndCreateTextArea(rawParameters);
-                Platform.runLater(() -> updateUIWithNewTextArea(textArea));
+                if (!Objects.isNull(textArea)) {
+                    Platform.runLater(() -> updateUIWithNewTextArea(textArea));
+                }
             });
         }
     }
diff --git a/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java b/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java
index 4573fe9e78b722838d104dc0b1a639f9eb498065..b5f24fc183a6c79c43085e2e973abd1a5e406ee1 100644
--- a/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java
+++ b/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java
@@ -35,12 +35,12 @@ public class Controller implements ControllerInterface {
         if (!rawParameters.isEmpty()) {
             String filePath = rawParameters.get(0);
             openAssociatedFile(filePath);
+            return null;
+        } else {
+            TextArea textArea = createNewTextArea();
+            configureTextArea(textArea);
+            return textArea;
         }
-
-        TextArea textArea = createNewTextArea();
-        configureTextArea(textArea);
-
-        return textArea;
     }
 
     /**