1 files changed, 7 insertions, 4 deletions
diff --git a/nest/cli.c b/nest/cli.c
index b54a0d76..469d45b6 100644
--- a/nest/cli.c
+++ b/nest/cli.c
@@ -302,7 +302,8 @@ cli_event(void *data)
 	cli_command(c);
     }
 
-  cli_write_trigger(c);
+  if (c->tx_pos)
+    cli_write_trigger(c);
 }
 
 cli *
@@ -319,7 +320,6 @@ cli_new(void *priv)
   c->event->data = c;
   c->cont = cli_hello;
   c->parser_pool = lp_new_default(c->pool);
-  c->show_pool = lp_new_default(c->pool);
   c->rx_buf = mb_alloc(c->pool, CLI_RX_BUF_SIZE);
   ev_schedule(c->event);
   return c;
@@ -409,11 +409,14 @@ void
 cli_free(cli *c)
 {
   cli_set_log_echo(c, 0, 0);
+  int defer = 0;
   if (c->cleanup)
-    c->cleanup(c);
+    defer = c->cleanup(c);
   if (c == cmd_reconfig_stored_cli)
     cmd_reconfig_stored_cli = NULL;
-  rfree(c->pool);
+
+  if (!defer)
+    rfree(c->pool);
 }
 
 /**