diff --git a/.editorconfig b/.editorconfig
index 26238e9..2b939e7 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,6 +3,7 @@ root = true
 [*]
 end_of_line = lf
 insert_final_newline = true
+trim_trailing_whitespace = true
 
 [*.java]
 indent_style = space
diff --git a/brouter-server/src/main/java/btools/server/RouteServer.java b/brouter-server/src/main/java/btools/server/RouteServer.java
index 7a846f0..0d681ad 100644
--- a/brouter-server/src/main/java/btools/server/RouteServer.java
+++ b/brouter-server/src/main/java/btools/server/RouteServer.java
@@ -264,18 +264,21 @@ public class RouteServer extends Thread implements Comparable<RouteServer> {
       e.printStackTrace();
     } finally {
       cr = null;
-      if (br != null) try {
-        br.close();
-      } catch (Exception e) {
-      }
-      if (bw != null) try {
-        bw.close();
-      } catch (Exception e) {
-      }
-      if (clientSocket != null) try {
-        clientSocket.close();
-      } catch (Exception e) {
-      }
+      if (br != null)
+        try {
+          br.close();
+        } catch (Exception e) {
+        }
+      if (bw != null)
+        try {
+          bw.close();
+        } catch (Exception e) {
+        }
+      if (clientSocket != null)
+        try {
+          clientSocket.close();
+        } catch (Exception e) {
+        }
       terminated = true;
       synchronized (threadPoolSync) {
         threadPoolSync.notifyAll();