diff --git a/src/enginuity/logger/ecu/EcuLogger.java b/src/enginuity/logger/ecu/EcuLogger.java
index 45f57406..1955c3dd 100644
--- a/src/enginuity/logger/ecu/EcuLogger.java
+++ b/src/enginuity/logger/ecu/EcuLogger.java
@@ -197,10 +197,13 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
                     SwingUtilities.invokeLater(new Runnable() {
                         public void run() {
                             String ecuId = ecuInit.getEcuId();
-                            String calId = settings.getLoggerEcuDefinitionMap().get(ecuId).getCalId();
-                            calIdLabel.setText(buildEcuInfoLabelText(CAL_ID_LABEL, calId));
+                            Map<String, EcuDefinition> ecuDefinitionMap = settings.getLoggerEcuDefinitionMap();
+                            if (!isNullOrEmpty(ecuDefinitionMap)) {
+                                String calId = ecuDefinitionMap.get(ecuId).getCalId();
+                                calIdLabel.setText(buildEcuInfoLabelText(CAL_ID_LABEL, calId));
+                            }
                             ecuIdLabel.setText(buildEcuInfoLabelText(ECU_ID_LABEL, ecuId));
-                            System.out.println("Loading logger config for new ECU (calid: " + calId + ", ecuid: " + ecuId + ")...");
+                            System.out.println("Loading logger config for new ECU (ecuid: " + ecuId + ")...");
                             loadLoggerConfig();
                         }
                     });
diff --git a/src/enginuity/util/ParamChecker.java b/src/enginuity/util/ParamChecker.java
index c539f659..b34880ee 100644
--- a/src/enginuity/util/ParamChecker.java
+++ b/src/enginuity/util/ParamChecker.java
@@ -91,6 +91,10 @@ public final class ParamChecker {
         return param == null || param.isEmpty();
     }
 
+    public static boolean isNullOrEmpty(Map<?, ?> param) {
+        return param == null || param.isEmpty();
+    }
+
     public static boolean isValidBit(int bit) {
         return bit >= 0 && bit <= 7;
     }