diff --git a/src/main/java/info/istlab/IoTP/SerialWindow.java b/src/main/java/info/istlab/IoTP/SerialWindow.java
index 479aa35..5455239 100644
--- a/src/main/java/info/istlab/IoTP/SerialWindow.java
+++ b/src/main/java/info/istlab/IoTP/SerialWindow.java
@@ -45,9 +45,8 @@
      * チェックして、App.serialName にポート名をセットするだけ。
      */
     public static void check(boolean popup_if_zero) {
-        if (App.serialName == null) {
-            if (serialChecker == null)
-                serialChecker = Launcher.theapp.serialChecker;
+        if (App.serialName == null || serialChecker == null) {
+            serialChecker = Launcher.theapp.serialChecker;
             serialChecker.updateSerialNames();
         }
         if (serialChecker.validSerialNames.size() == 0) {
@@ -318,12 +317,14 @@
         }
         // SerialWindow.hash.clear();
     }
+
     public static void openAll() {
-        if (serialChecker == null) serialChecker = Launcher.theapp.serialChecker;
+        if (serialChecker == null)
+            serialChecker = Launcher.theapp.serialChecker;
         serialChecker.portHash.entrySet().forEach(ent -> {
             String key = ent.getKey();
             SerialPort sp = ent.getValue();
-            if (hash.get(key)!= null){
+            if (hash.get(key) != null) {
                 SerialWindow swin = hash.get(key);
                 swin.setVisible(true);
                 swin.reconnect();
@@ -333,7 +334,6 @@
         });
     }
 
-
     public static void disposeByName(String serialName) {
         for (String key : SerialWindow.hash.keySet()) {
             if (!key.equals(serialName))
@@ -412,5 +412,4 @@
     public void keyReleased(KeyEvent e) {
     }
 
-
 }