diff --git a/src/kcrash.cpp b/src/kcrash.cpp
--- a/src/kcrash.cpp
+++ b/src/kcrash.cpp
@@ -769,6 +769,7 @@
 
 static pid_t startFromKdeinit(int argc, const char *argv[])
 {
+#define HANDLE_ERROR(ERR) do { if ((ERR) < 0) return 0; } while (0)
     int socket = openSocket();
     if (socket < -1) {
         return 0;
@@ -817,13 +818,13 @@
     }
 
     header.arg_length = pos;
-    write_socket(socket, (char *) &header, sizeof(header));
+    HANDLE_ERROR(write_socket(socket, (char *) &header, sizeof(header)));
 
-    write_socket(socket, argcl);
+    HANDLE_ERROR(write_socket(socket, argcl));
     for (int i = 0; i<argc; i++)
-        write_socket (socket, argv[i]);
+        HANDLE_ERROR(write_socket (socket, argv[i]));
 
-    write_socket(socket, env);
+    HANDLE_ERROR(write_socket(socket, env));
     for (long i = 0; i < env; ++i) {
         const char * to_write = environ[i];
         if (!environ[i] || strncmp(environ[i], s_envVar, strlen(s_envVar) - 1) == 0)
@@ -833,24 +834,24 @@
             // This means there has been an error calculating the environment, or the environment changed
             return 0;
         }
-        write_socket(socket, to_write);
+        HANDLE_ERROR(write_socket(socket, to_write));
     }
     if (envbytes) {
       fprintf(stderr, "KCrash: mismatch in environment sizes (too few bytes written: %ld)\n", envbytes);
       // Similar error as above
       return 0;
     }
 
-    write_socket(socket, avoid_loops);
+    HANDLE_ERROR(write_socket(socket, avoid_loops));
     if (cwd_ok)
-        write_socket(socket, cwd);
+        HANDLE_ERROR(write_socket(socket, cwd));
 
     if (read_socket(socket, (char *) &header, sizeof(header)) < 0
             || header.cmd != LAUNCHER_OK) {
         return 0;
     }
     long pid;
-    read_socket(socket, (char *) &pid, sizeof(pid));
+    HANDLE_ERROR(read_socket(socket, (char *) &pid, sizeof(pid)));
     return static_cast<pid_t>(pid);
 }