diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_download.c b/legacy/ecore/src/lib/ecore_file/ecore_file_download.c
index ed21d15db4..2b761544a6 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_download.c
+++ b/legacy/ecore/src/lib/ecore_file/ecore_file_download.c
@@ -66,12 +66,14 @@ ecore_file_download_shutdown(void)
 {
    if (--init == 0)
      {
-	ecore_event_handler_del(_url_complete_handler);
-	ecore_event_handler_del(_url_progress_download);
+	if (_url_complete_handler)
+	  ecore_event_handler_del(_url_complete_handler);
+	if (_url_progress_download)
+	  ecore_event_handler_del(_url_progress_download);
 	_url_complete_handler = NULL;
 	_url_progress_download = NULL;
-
-	ecore_list_destroy(_job_list);
+	if (_job_list)
+	  ecore_list_destroy(_job_list);
 	_job_list = NULL;
      }