diff --git a/src/buffering/buffered_printf.c b/src/buffering/buffered_printf.c
index 37de93182c4422ef92c9dc9e11d38d852bf55396..20e8ac694ae0ef59e4b5a392ba57a2aa25a4f055 100644
--- a/src/buffering/buffered_printf.c
+++ b/src/buffering/buffered_printf.c
@@ -5,12 +5,12 @@
 /*
  * testing settings
  */
-/*
-  #undef BUFFERED_STRING_OVERRUN_WARNINGS
-  #define BUFFERED_STRING_OVERRUN_WARNINGS
-  #undef BUFFERED_PRINTF_MAX_BUFFER_SIZE
-  #define BUFFERED_PRINTF_MAX_BUFFER_SIZE ((size_t)(1024*2))
-*/
+
+#undef BUFFERED_STRING_OVERRUN_WARNINGS
+#define BUFFERED_STRING_OVERRUN_WARNINGS
+#undef BUFFERED_PRINTF_MAX_BUFFER_SIZE
+#define BUFFERED_PRINTF_MAX_BUFFER_SIZE ((size_t)(1024*2))
+
 
 static size_t __deslash(char * const string);
 static void __buffered_printf_error(struct tmpstore_t * t,
@@ -306,7 +306,7 @@ int Gnu_format_args(3,4) buffered_printf(
     {
         __buffered_printf_error(
             stardata->tmpstore,
-            "SYSTEM_ERROR buffered_printf uncaught problem %d \"%s\" : time = %g\n",
+            "SYSTEM_ERROR buffered_printf error %d \"%s\" : time = %g\n",
             retval,
             Buffered_printf_error_string(retval),
             stardata->model.time
diff --git a/src/buffering/buffering_macros.h b/src/buffering/buffering_macros.h
index 1cc335d93170c04fc14bdcc28e9dfb93a3e6c084..3445be578a5c419b7f6f0f7747e979c2884f480e 100644
--- a/src/buffering/buffering_macros.h
+++ b/src/buffering/buffering_macros.h
@@ -17,11 +17,11 @@
  */
 #define Buffered_printf_error_string(N)                         \
     (                                                           \
-        (N) == BUFFERED_PRINTF_GENERIC_ERROR ? "Generic" :      \
-        (N) == BUFFERED_PRINTF_ASPRINTF_ERROR ? "asprintf" :    \
-        (N) == BUFFERED_PRINTF_ALLOC_ERROR ? "alloc" :          \
-        (N) == BUFFERED_PRINTF_FULL_ERROR ? "full" :            \
-        (N) == BUFFERED_PRINTF_STARDATA_ERROR ? "stardata" :    \
+        (N) == BUFFERED_PRINTF_GENERIC_ERROR ? "generic problem" :      \
+        (N) == BUFFERED_PRINTF_ASPRINTF_ERROR ? "asprintf failed" :    \
+        (N) == BUFFERED_PRINTF_ALLOC_ERROR ? "alloc failed" :          \
+        (N) == BUFFERED_PRINTF_FULL_ERROR ? "buffer is full" :            \
+        (N) == BUFFERED_PRINTF_STARDATA_ERROR ? "stardata or stardata->tmpstore is NULL" :    \
         "unknown"                                               \
         )