diff --git a/src/main.c b/src/main.c
index 2c45497..f387292 100644
--- a/src/main.c
+++ b/src/main.c
@@ -76,7 +76,9 @@ int main(int argc, char *argv[])
 
     /* Create log file */
     if (option.log)
+    {
         log_open(option.log_filename);
+    }
 
     /* Initialize ANSI text formatting (colors etc.) */
     print_init_ansi_formatting();
@@ -86,11 +88,16 @@ int main(int argc, char *argv[])
     tio_printf("Press ctrl-t q to quit");
 
     /* Open socket */
-    socket_configure();
+    if (option.socket)
+    {
+        socket_configure();
+    }
 
     /* Connect to tty device */
     if (option.no_autoconnect)
+    {
         status = tty_connect();
+    }
     else
     {
         /* Enter connect loop */
diff --git a/src/socket.c b/src/socket.c
index b9081cb..801ef3f 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -85,11 +85,6 @@ void socket_configure(void)
     struct sockaddr *sockaddr_p;
     socklen_t socklen;
 
-    if (!option.socket)
-    {
-        return;
-    }
-
     /* Parse socket string */
 
     if (strncmp(option.socket, "unix:", 5) == 0)