JavaIsJavaScript
diff --git a/‎src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java‎
Lines changed: 7 additions & 0 deletions b/‎src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java‎
Lines changed: 4 additions & 0 deletions b/‎src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java‎
Lines changed: 4 additions & 0 deletions
@@ -1,5 +1,6 @@
 package de.rwth.idsg.steve.ocpp.ws;
 
+import com.google.common.base.Strings;
 import de.rwth.idsg.steve.config.WebSocketConfiguration;
 import de.rwth.idsg.steve.ocpp.OcppVersion;
 import de.rwth.idsg.steve.ocpp.ws.data.CommunicationContext;
@@ -75,6 +76,12 @@ private void handleTextMessage(WebSocketSession session, TextMessage webSocketMe
         String incomingString = webSocketMessage.getPayload();
         String chargeBoxId = getChargeBoxId(session);
 
+        // https://github.com/RWTH-i5-IDSG/steve/issues/66
+        if (Strings.isNullOrEmpty(incomingString)) {
+            WebSocketLogger.receivedEmptyText(chargeBoxId, session);
+            return;
+        }
+
         WebSocketLogger.receivedText(chargeBoxId, session, incomingString);
 
         CommunicationContext context = new CommunicationContext(session, chargeBoxId);
 
@@ -37,6 +37,10 @@ public static void receivedText(String chargeBoxId, WebSocketSession session, St
         log.info("[chargeBoxId={}, sessionId={}] Received: {}", chargeBoxId, session.getId(), msg);
     }
 
+    public static void receivedEmptyText(String chargeBoxId, WebSocketSession session) {
+        log.warn("[chargeBoxId={}, sessionId={}] Received empty text message. Will pretend this never happened.", chargeBoxId, session.getId());
+    }
+
     public static void pingError(String chargeBoxId, WebSocketSession session, Throwable t) {
         if (log.isErrorEnabled()) {
             log.error("[chargeBoxId=" + chargeBoxId + ", sessionId=" + session.getId() + "] Ping error", t);