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;