diff --git a/src/lv_init.c b/src/lv_init.c
index 14bb4f7495..569e919427 100644
--- a/src/lv_init.c
+++ b/src/lv_init.c
@@ -384,10 +384,6 @@ void lv_deinit(void)
     lv_span_stack_deinit();
 #endif
 
-#if LV_USE_DRAW_SW
-    lv_draw_sw_deinit();
-#endif
-
 #if LV_USE_FREETYPE
     lv_freetype_uninit();
 #endif
diff --git a/src/osal/lv_freertos.c b/src/osal/lv_freertos.c
index 3a0c2bf1e3..3744f58552 100644
--- a/src/osal/lv_freertos.c
+++ b/src/osal/lv_freertos.c
@@ -176,6 +176,8 @@ lv_result_t lv_mutex_unlock(lv_mutex_t * pxMutex)
 
 lv_result_t lv_mutex_delete(lv_mutex_t * pxMutex)
 {
+    if(pxMutex->xIsInitialized == pdFALSE)
+        return LV_RESULT_INVALID;
     vSemaphoreDelete(pxMutex->xMutex);
     pxMutex->xIsInitialized = pdFALSE;