diff --git a/src/bin/e.h b/src/bin/e.h
index 9727347eb..c66a7a2ac 100644
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -7,8 +7,8 @@
 #include "config.h"
 
 #define USE_IPC
-#define OBJECT_PARANOIA_CHECK
-#define OBJECT_CHECK
+//#define OBJECT_PARANOIA_CHECK
+//#define OBJECT_CHECK
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/bin/e_int_gadcon_config.c b/src/bin/e_int_gadcon_config.c
index b17a648fc..ea8346ab7 100644
--- a/src/bin/e_int_gadcon_config.c
+++ b/src/bin/e_int_gadcon_config.c
@@ -315,7 +315,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 	for (l2 = e_gadcon_provider_list(); l2; l2 = l2->next)
 	  {
 	     cc = l2->data;
-	     if ((cc->name) && (!strcmp(cc->name, cf_gcc->name))) break;
+	     if ((cc->name) && (cf_gcc->name) &&
+		 (!strcmp(cc->name, cf_gcc->name))) break;
 	     cc = NULL;
 	  }
 	if (cc)