diff --git a/src/commands.c b/src/commands.c
index 14bd877d..ddc659eb 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -766,7 +766,7 @@ void cmd_border(I3_CMD, const char *border_style_str, long border_width) {
  */
 void cmd_nop(I3_CMD, const char *comment) {
     LOG("-------------------------------------------------\n");
-    LOG("  NOP: %s\n", comment);
+    LOG("  NOP: %.4000s\n", comment);
     LOG("-------------------------------------------------\n");
     ysuccess(true);
 }
diff --git a/src/commands_parser.c b/src/commands_parser.c
index f734a7aa..2fd76309 100644
--- a/src/commands_parser.c
+++ b/src/commands_parser.c
@@ -263,7 +263,7 @@ char *parse_string(const char **walk, bool as_word) {
  * Free the returned CommandResult with command_result_free().
  */
 CommandResult *parse_command(const char *input, yajl_gen gen, ipc_client *client) {
-    DLOG("COMMAND: *%s*\n", input);
+    DLOG("COMMAND: *%.4000s*\n", input);
     state = INITIAL;
     CommandResult *result = scalloc(1, sizeof(CommandResult));
 
diff --git a/src/ipc.c b/src/ipc.c
index 100e1f70..75fa8ee7 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -217,15 +217,14 @@ void ipc_shutdown(shutdown_reason_t reason, int exempt_fd) {
 }
 
 /*
- * Executes the command and returns whether it could be successfully parsed
- * or not (at the moment, always returns true).
+ * Executes the given command.
  *
  */
 IPC_HANDLER(run_command) {
     /* To get a properly terminated buffer, we copy
      * message_size bytes out of the buffer */
     char *command = sstrndup((const char *)message, message_size);
-    LOG("IPC: received: *%s*\n", command);
+    LOG("IPC: received: *%.4000s*\n", command);
     yajl_gen gen = yajl_gen_alloc(NULL);
 
     CommandResult *result = parse_command(command, gen, client);