diff --git a/src/hwmon.c b/src/hwmon.c
index 780500479..7a8375e5a 100644
--- a/src/hwmon.c
+++ b/src/hwmon.c
@@ -3082,7 +3082,7 @@ int hwmon_ctx_init (hashcat_ctx_t *hashcat_ctx)
 
           if ((ADL_rc = hm_ADL_Overdrive_State_Set (hashcat_ctx, hwmon_ctx->hm_device[device_id].adl, ADL_OD6_SETSTATE_PERFORMANCE, performance_state)) == -1)
           {
-            event_log_info (hashcat_ctx, "Failed to set ADL performance state");
+            event_log_error (hashcat_ctx, "Failed to set ADL performance state");
 
             return -1;
           }
@@ -3277,7 +3277,7 @@ void hwmon_ctx_destroy (hashcat_ctx_t *hashcat_ctx)
 
         if ((hm_ADL_Overdrive6_PowerControl_Caps (hashcat_ctx, hwmon_ctx->hm_device[device_id].adl, &powertune_supported)) == -1)
         {
-          event_log_error (hashcat_ctx, "Failed to get ADL PowerControl Capabilities");
+          //event_log_error (hashcat_ctx, "Failed to get ADL PowerControl Capabilities");
 
           continue;
         }
@@ -3288,7 +3288,7 @@ void hwmon_ctx_destroy (hashcat_ctx_t *hashcat_ctx)
 
           if ((hm_ADL_Overdrive_PowerControl_Set (hashcat_ctx, hwmon_ctx->hm_device[device_id].adl, hwmon_ctx->od_power_control_status[device_id])) == -1)
           {
-            event_log_info (hashcat_ctx, "Failed to restore the ADL PowerControl values");
+            //event_log_error (hashcat_ctx, "Failed to restore the ADL PowerControl values");
 
             continue;
           }
@@ -3306,7 +3306,7 @@ void hwmon_ctx_destroy (hashcat_ctx_t *hashcat_ctx)
 
           if ((hm_ADL_Overdrive_State_Set (hashcat_ctx, hwmon_ctx->hm_device[device_id].adl, ADL_OD6_SETSTATE_PERFORMANCE, performance_state)) == -1)
           {
-            event_log_info (hashcat_ctx, "Failed to restore ADL performance state");
+            //event_log_info (hashcat_ctx, "Failed to restore ADL performance state");
 
             continue;
           }
diff --git a/src/opencl.c b/src/opencl.c
index 63c650d14..5243a9bfd 100644
--- a/src/opencl.c
+++ b/src/opencl.c
@@ -303,20 +303,21 @@ int ocl_init (hashcat_ctx_t *hashcat_ctx)
 
   if (ocl->lib == NULL)
   {
-    event_log_info (hashcat_ctx, "");
-    event_log_info (hashcat_ctx, "ATTENTION! Can't find OpenCL ICD loader library");
-    event_log_info (hashcat_ctx, "");
-    #if defined (__linux__)
-    event_log_info (hashcat_ctx, "You're probably missing the \"ocl-icd-libopencl1\" package (Debian/Ubuntu)");
-    event_log_info (hashcat_ctx, "  sudo apt-get install ocl-icd-libopencl1");
-    event_log_info (hashcat_ctx, "");
-    #elif defined (_WIN)
-    event_log_info (hashcat_ctx, "You're probably missing the OpenCL runtime installation");
-    event_log_info (hashcat_ctx, "  AMD users require AMD drivers 14.9 or later (recommended 15.12 or later)");
-    event_log_info (hashcat_ctx, "  Intel users require Intel OpenCL Runtime 14.2 or later (recommended 15.1 or later)");
-    event_log_info (hashcat_ctx, "  NVidia users require NVidia drivers 346.59 or later (recommended 361.x or later)");
-    event_log_info (hashcat_ctx, "");
-    #endif
+    event_log_warning (hashcat_ctx,
+      "Can't find OpenCL ICD loader library" EOL
+      ""                                     EOL
+      #if defined (__linux__)
+      "You're probably missing the \"ocl-icd-libopencl1\" package (Debian/Ubuntu)" EOL
+      "Run: sudo apt-get install ocl-icd-libopencl1"                               EOL
+      ""                                                                           EOL
+      #elif defined (_WIN)
+      "You're probably missing the OpenCL runtime installation"                              EOL
+      "* AMD users require AMD drivers 14.9 or later (recommended 15.12 or later)"           EOL
+      "* Intel users require Intel OpenCL Runtime 14.2 or later (recommended 15.1 or later)" EOL
+      "* NVidia users require NVidia drivers 346.59 or later (recommended 361.x or later)"   EOL
+      ""                                                                                     EOL
+      #endif
+    );
 
     return -1;
   }
@@ -1902,7 +1903,9 @@ int opencl_ctx_init (hashcat_ctx_t *hashcat_ctx)
 
   opencl_ctx->ocl = ocl;
 
-  ocl_init (hashcat_ctx);
+  const int rc_ocl_init = ocl_init (hashcat_ctx);
+
+  if (rc_ocl_init == -1) return -1;
 
   /**
    * OpenCL platform selection