diff --git a/control/auxiliary.c b/control/auxiliary.c
index 949d8eee4501576bef88fc12d48ccdff21784bc6..37d657fbfdc95045ab1c27fc7bd12854cfee97b8 100644
--- a/control/auxiliary.c
+++ b/control/auxiliary.c
@@ -80,14 +80,7 @@ void morse_warning(const char *func_name, char* msg_text)
  ******************************************************************************/
 void morse_error(const char *func_name, char* msg_text)
 {
-    MORSE_context_t *morse;
-
-    morse = morse_context_self();
-    if (morse == NULL)
-        morse_fatal_error("morse_error", "MORSE not initialized");
-    if (morse->errors_enabled)
-        fprintf(stderr, "MORSE ERROR: %s(): %s\n", func_name, msg_text);
-
+    fprintf(stderr, "MORSE ERROR: %s(): %s\n", func_name, msg_text);
 }
 
 /*******************************************************************************
diff --git a/control/context.c b/control/context.c
index 483630782bad68a5b11c50d5a1942653c4c9be77..4d901902d3588b955fb6a62bd86ee8e8804363d9 100644
--- a/control/context.c
+++ b/control/context.c
@@ -77,8 +77,7 @@ MORSE_context_t *morse_context_create()
     morse->ncudas             = 0;
     morse->nthreads_per_worker= 1;
 
-    morse->errors_enabled       = MORSE_FALSE;
-    morse->warnings_enabled     = MORSE_FALSE;
+    morse->warnings_enabled     = MORSE_TRUE;
     morse->autotuning_enabled   = MORSE_TRUE;
     morse->parallel_enabled     = MORSE_FALSE;
     morse->profiling_enabled    = MORSE_FALSE;
@@ -128,7 +127,6 @@ int morse_context_destroy(){
  * @param[in] option
  *          Feature to be enabled:
  *          @arg MORSE_WARNINGS   printing of warning messages,
- *          @arg MORSE_ERRORS     printing of error messages,
  *          @arg MORSE_AUTOTUNING autotuning for tile size and inner block size.
  *          @arg MORSE_PROFILING_MODE  activate profiling of kernels
  *          @arg MORSE_PROGRESS  activate progress indicator
@@ -155,9 +153,6 @@ int MORSE_Enable(MORSE_enum option)
         case MORSE_WARNINGS:
             morse->warnings_enabled = MORSE_TRUE;
             break;
-        case MORSE_ERRORS:
-            morse->errors_enabled = MORSE_TRUE;
-            break;
         case MORSE_AUTOTUNING:
             morse->autotuning_enabled = MORSE_TRUE;
             break;
@@ -201,7 +196,6 @@ int MORSE_Enable(MORSE_enum option)
  * @param[in] option
  *          Feature to be disabled:
  *          @arg MORSE_WARNINGS   printing of warning messages,
- *          @arg MORSE_ERRORS     printing of error messages,
  *          @arg MORSE_AUTOTUNING autotuning for tile size and inner block size.
  *          @arg MORSE_PROFILING_MODE  deactivate profiling of kernels
  *          @arg MORSE_PROGRESS  deactivate progress indicator
@@ -227,9 +221,6 @@ int MORSE_Disable(MORSE_enum option)
         case MORSE_WARNINGS:
             morse->warnings_enabled = MORSE_FALSE;
             break;
-        case MORSE_ERRORS:
-            morse->errors_enabled = MORSE_FALSE;
-            break;
         case MORSE_AUTOTUNING:
             morse->autotuning_enabled = MORSE_FALSE;
             break;
diff --git a/include/morse_struct.h b/include/morse_struct.h
index 522dd61fe9c02fca04e95a824e4ed8d90a5929e8..f307645d27a6b5ab39cbc36963b8dee547409cd3 100644
--- a/include/morse_struct.h
+++ b/include/morse_struct.h
@@ -128,7 +128,6 @@ typedef struct morse_context_s {
     int                group_size;
 
     /* Boolean flags */
-    MORSE_bool         errors_enabled;
     MORSE_bool         warnings_enabled;
     MORSE_bool         autotuning_enabled;
     MORSE_bool         parallel_enabled;
diff --git a/timing/timing.c b/timing/timing.c
index cbe776621563110f3338455643d65e70cbdf224f..d271202961ae3c3200abd8aa1d7a61efdf7b8c19 100644
--- a/timing/timing.c
+++ b/timing/timing.c
@@ -492,7 +492,7 @@ main(int argc, char *argv[]) {
     iparam[IPARAM_GEMM3M        ] = 0;
     iparam[IPARAM_PROGRESS      ] = 0;
     iparam[IPARAM_PROFILE       ] = 0;
-    iparam[IPARAM_PRINT_ERRORS  ] = 0;
+    iparam[IPARAM_PRINT_WARNINGS] = 1;
     iparam[IPARAM_PEAK          ] = 0;
     iparam[IPARAM_PARALLEL_TASKS] = 0;
     iparam[IPARAM_NO_CPU        ] = 0;
@@ -586,8 +586,8 @@ main(int argc, char *argv[]) {
             iparam[IPARAM_PEAK] = 1;
         } else if (startswith( argv[i], "--noprofile" )) {
             iparam[IPARAM_PROFILE] = 0;
-        } else if (startswith( argv[i], "--printerrors" )) {
-            iparam[IPARAM_PRINT_ERRORS] = 1;
+        } else if (startswith( argv[i], "--nowarnings" )) {
+            iparam[IPARAM_PRINT_WARNINGS] = 0;
 /*         } else if (startswith( argv[i], "--parallel=" )) { */
 /*             sscanf( strchr( argv[i], '=' ) + 1, "%d", &(iparam[IPARAM_PARALLEL_TASKS]) ); */
 /*         } else if (startswith( argv[i], "--noparallel" )) { */
@@ -653,12 +653,12 @@ main(int argc, char *argv[]) {
     if (iparam[IPARAM_PROFILE] == 1)
         MORSE_Enable(MORSE_PROFILING_MODE);
 
-    if (iparam[IPARAM_PRINT_ERRORS] == 1)
-        MORSE_Enable(MORSE_ERRORS);
-
     if (iparam[IPARAM_PROGRESS] == 1)
         MORSE_Enable(MORSE_PROGRESS);
 
+    if (iparam[IPARAM_PRINT_WARNINGS] == 0)
+        MORSE_Disable(MORSE_WARNINGS);
+
     if (iparam[IPARAM_GEMM3M] == 1)
         MORSE_Enable(MORSE_GEMM3M);
 
diff --git a/timing/timing.h b/timing/timing.h
index fd2ac6ac3549b75900eab0d622addc5d083f080a..08190507adf01d37c36d7edbf4d874fd5d70e560 100644
--- a/timing/timing.h
+++ b/timing/timing.h
@@ -54,7 +54,7 @@ enum iparam_timing {
     IPARAM_GEMM3M,         /* Use GEMM3M for complex matrix vector products */
     /* Added for StarPU version */
     IPARAM_PROFILE,
-    IPARAM_PRINT_ERRORS,
+    IPARAM_PRINT_WARNINGS,
     IPARAM_PEAK,
     IPARAM_PARALLEL_TASKS,
     IPARAM_NO_CPU,