diff --git a/module/idoutils/src/dbqueries.c b/module/idoutils/src/dbqueries.c
index 985fb8c..38e5cfc 100644
--- a/module/idoutils/src/dbqueries.c
+++ b/module/idoutils/src/dbqueries.c
@@ -82,6 +82,10 @@ int ido2db_query_insert_or_update_timedevent_add(ido2db_idi *idi, void **data) {
                 ido2db_log_debug_info(IDO2DB_DEBUGL_PROCESSINFO, 2, "ido2db_query_insert_or_update_timedevents_add(%lu) update rows matched\n", (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result)));
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
                         dummy = asprintf(&query, "SELECT timedevent_id FROM %s WHERE instance_id=%lu AND event_type=%d AND scheduled_time=%s AND object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_TIMEDEVENTS],
                                  *(unsigned long *) data[0],    /* unique constraint start */
@@ -121,6 +125,11 @@ int ido2db_query_insert_or_update_timedevent_add(ido2db_idi *idi, void **data) {
                                         );
                 	        /* send query to db */
                         	result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
+
 	                        free(query2);
 			}
                 }
@@ -269,6 +278,10 @@ int ido2db_query_insert_or_update_timedeventqueue_add(ido2db_idi *idi, void **da
                 ido2db_log_debug_info(IDO2DB_DEBUGL_PROCESSINFO, 2, "ido2db_query_insert_or_update_timedeventqueue_add(%lu) update rows matched\n", (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result)));  
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
                         dummy = asprintf(&query, "SELECT timedeventqueue_id FROM %s WHERE instance_id=%lu AND event_type=%d AND scheduled_time=%s AND object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_TIMEDEVENTQUEUE],
                                  *(unsigned long *) data[0],    /* unique constraint start */
@@ -308,6 +321,10 @@ int ido2db_query_insert_or_update_timedeventqueue_add(ido2db_idi *idi, void **da
                                         );
 	                        /* send query to db */
         	                result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
 	                        free(query2);
 			}
                 }
@@ -332,6 +349,10 @@ int ido2db_query_insert_or_update_timedeventqueue_add(ido2db_idi *idi, void **da
 		ido2db_log_debug_info(IDO2DB_DEBUGL_PROCESSINFO, 2, "ido2db_query_insert_or_update_timedeventqueue_add(%lu) update rows matched\n", (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result)));
 		/* check result if update was ok */
 		if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 			/* try insert instead */
 			dummy = asprintf(&query2, "INSERT INTO %s (instance_id, event_type, queued_time, queued_time_usec, scheduled_time, recurring_event, object_id) VALUES (%lu, %d, %s, %lu, %s, %d, %lu)",
 			                 ido2db_db_tablenames[IDO2DB_DBTABLE_TIMEDEVENTQUEUE],
@@ -454,6 +475,10 @@ int ido2db_query_insert_or_update_timedevents_execute_add(ido2db_idi *idi, void
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
                         dummy = asprintf(&query, "SELECT timedevent_id FROM %s WHERE instance_id=%lu AND event_type=%d AND scheduled_time=%s AND object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_TIMEDEVENTS],
                                  *(unsigned long *) data[0],     /* unique constraint start */
@@ -493,6 +518,10 @@ int ido2db_query_insert_or_update_timedevents_execute_add(ido2db_idi *idi, void
                                         );
                 	        /* send query to db */
 	                        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
         	                free(query2);
 			}
                 }
@@ -514,6 +543,10 @@ int ido2db_query_insert_or_update_timedevents_execute_add(ido2db_idi *idi, void
 
 		/* check result if update was ok */
 		if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 			/* try insert instead */
 			dummy = asprintf(&query2, "INSERT INTO %s (instance_id, event_type, event_time, event_time_usec, scheduled_time, recurring_event, object_id) VALUES (%lu, %d, %s, %lu, %s, %d, %lu)",
 			                 ido2db_db_tablenames[IDO2DB_DBTABLE_TIMEDEVENTS],
@@ -657,6 +690,10 @@ int ido2db_query_insert_or_update_systemcommanddata_add(ido2db_idi *idi, void **
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT systemcommand_id FROM %s WHERE instance_id=%lu AND start_time=%s AND start_time_usec=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_SYSTEMCOMMANDS],
@@ -702,6 +739,10 @@ int ido2db_query_insert_or_update_systemcommanddata_add(ido2db_idi *idi, void **
                                         );
                 	        /* send query to db */
                         	result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
 	                        free(query2);
 			}
                 }
@@ -924,6 +965,10 @@ int ido2db_query_insert_or_update_eventhandlerdata_add(ido2db_idi *idi, void **d
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT eventhandler_id FROM %s WHERE instance_id=%lu AND start_time=%s AND start_time_usec=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_EVENTHANDLERS],
@@ -974,6 +1019,10 @@ int ido2db_query_insert_or_update_eventhandlerdata_add(ido2db_idi *idi, void **d
                                         );
                 	        /* send query to db */
 	                        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
         	                free(query2);
 			}
                 }
@@ -1224,6 +1273,10 @@ int ido2db_query_insert_or_update_notificationdata_add(ido2db_idi *idi, void **d
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT notification_id FROM %s WHERE instance_id=%lu AND start_time=%s AND start_time_usec=%lu AND object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_NOTIFICATIONS],
@@ -1270,6 +1323,10 @@ int ido2db_query_insert_or_update_notificationdata_add(ido2db_idi *idi, void **d
                                         );
         	                /* send query to db */
                 	        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
                         	free(query2);
 			}
                 }
@@ -1470,6 +1527,10 @@ int ido2db_query_insert_or_update_contactnotificationdata_add(ido2db_idi *idi, v
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT contactnotification_id FROM %s WHERE instance_id=%lu AND contact_object_id=%lu AND start_time=%s AND start_time_usec=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_CONTACTNOTIFICATIONS],
@@ -1510,6 +1571,10 @@ int ido2db_query_insert_or_update_contactnotificationdata_add(ido2db_idi *idi, v
                                         );
 	                        /* send query to db */
         	                result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
                 	        free(query2);
 			}
                 }
@@ -1657,6 +1722,10 @@ int ido2db_query_insert_or_update_contactnotificationmethoddata_add(ido2db_idi *
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT contactnotificationmethod_id FROM %s WHERE instance_id=%lu AND contactnotification_id=%lu AND start_time=%s AND start_time_usec=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_CONTACTNOTIFICATIONMETHODS],
@@ -1698,6 +1767,10 @@ int ido2db_query_insert_or_update_contactnotificationmethoddata_add(ido2db_idi *
                                         );
                         	/* send query to db */
                 	        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
 	                        free(query2);
 			}
                 }
@@ -2367,6 +2440,10 @@ int ido2db_query_insert_or_update_commentdata_add(ido2db_idi *idi, void **data)
 		 * be sure about it.
 		 */
 		if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 	                dummy = asprintf(&query, "SELECT comment_id FROM %s WHERE instance_id=%lu AND comment_time=%s AND internal_comment_id=%lu",
 					ido2db_db_tablenames[IDO2DB_DBTABLE_COMMENTS],
 					*(unsigned long *) data[2],     /* unique constraint start */
@@ -2411,6 +2488,10 @@ int ido2db_query_insert_or_update_commentdata_add(ido2db_idi *idi, void **data)
                                         );
                 	        /* send query to db */
                         	result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
 	                        free(query2);
 			}
                 }
@@ -2610,6 +2691,10 @@ int ido2db_query_insert_or_update_commentdata_history_add(ido2db_idi *idi, void
                  * be sure about it.
                  */
 		if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 	                dummy = asprintf(&query, "SELECT commenthistory_id FROM %s WHERE instance_id=%lu AND comment_time=%s AND internal_comment_id=%lu",
 				ido2db_db_tablenames[IDO2DB_DBTABLE_COMMENTHISTORY],
 				*(unsigned long *) data[2],     /* unique constraint start */
@@ -2655,6 +2740,10 @@ int ido2db_query_insert_or_update_commentdata_history_add(ido2db_idi *idi, void
                                         );
                 	        /* send query to db */
                         	result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
 	                        free(query2);
 			}
                 }
@@ -2860,6 +2949,10 @@ int ido2db_query_insert_or_update_downtimedata_scheduled_downtime_add(ido2db_idi
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT scheduleddowntime_id FROM %s WHERE instance_id=%lu AND object_id=%lu AND entry_time=%s AND internal_downtime_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_SCHEDULEDDOWNTIME]
@@ -2909,6 +3002,10 @@ int ido2db_query_insert_or_update_downtimedata_scheduled_downtime_add(ido2db_idi
                                         );
         	                /* send query to db */
                 	        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
                         	free(query2);
 			}
                 }
@@ -3117,6 +3214,10 @@ int ido2db_query_insert_or_update_downtimedata_downtime_history_add(ido2db_idi *
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT downtimehistory_id FROM %s WHERE instance_id=%lu AND object_id=%lu AND entry_time=%s AND internal_downtime_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_DOWNTIMEHISTORY]
@@ -3167,6 +3268,10 @@ int ido2db_query_insert_or_update_downtimedata_downtime_history_add(ido2db_idi *
                                         );
         	                /* send query to db */
                 	        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
                         	free(query2);
 			}
                 }
@@ -3398,6 +3503,10 @@ int ido2db_query_insert_or_update_programstatusdata_add(ido2db_idi *idi, void **
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT programstatus_id FROM %s WHERE instance_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_PROGRAMSTATUS],
@@ -3774,6 +3883,10 @@ int ido2db_query_insert_or_update_hoststatusdata_add(ido2db_idi *idi, void **dat
 		ido2db_log_debug_info(IDO2DB_DEBUGL_PROCESSINFO, 2, "ido2db_query_insert_or_update_hoststatusdata_add() dbi_result_get_numrows_affected=%lu\n", dbi_result_get_numrows_affected(idi->dbinfo.dbi_result));
 
 		if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 			dummy = asprintf(&query, "SELECT hoststatus_id FROM %s WHERE host_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_HOSTSTATUS],
                                 *(unsigned long *) data[1]     /* unique constraint start/end */
@@ -3848,6 +3961,10 @@ int ido2db_query_insert_or_update_hoststatusdata_add(ido2db_idi *idi, void **dat
                                         );
         	                /* send query to db */
                 	        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
                         	free(query2);
 			}
                 }
@@ -4287,6 +4404,10 @@ int ido2db_query_insert_or_update_servicestatusdata_add(ido2db_idi *idi, void **
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
 	                dummy = asprintf(&query, "SELECT servicestatus_id FROM %s WHERE service_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_SERVICESTATUS],
@@ -4363,6 +4484,10 @@ int ido2db_query_insert_or_update_servicestatusdata_add(ido2db_idi *idi, void **
                                         );
                 	        /* send query to db */
                         	result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
 	                        free(query2);
 			}
                 }
@@ -4752,6 +4877,10 @@ int ido2db_query_insert_or_update_contactstatusdata_add(ido2db_idi *idi, void **
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT contactstatus_id FROM %s WHERE contact_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_CONTACTSTATUS],
@@ -4792,6 +4921,10 @@ int ido2db_query_insert_or_update_contactstatusdata_add(ido2db_idi *idi, void **
                                         );
                 	        /* send query to db */
 	                        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
         	                free(query2);
 			}
                 }
@@ -4958,6 +5091,10 @@ int ido2db_query_insert_or_update_configfilevariables_add(ido2db_idi *idi, void
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT configfile_id FROM %s WHERE instance_id=%lu AND configfile_type=%d AND configfile_path='%s'",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_CONFIGFILES],
@@ -4993,6 +5130,10 @@ int ido2db_query_insert_or_update_configfilevariables_add(ido2db_idi *idi, void
                                         );
                 	        /* send query to db */
                         	result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
 	                        free(query2);
 			}
                 }
@@ -5129,6 +5270,10 @@ int ido2db_query_insert_or_update_runtimevariables_add(ido2db_idi *idi, void **d
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT runtimevariable_id FROM %s WHERE instance_id=%lu AND varname='%s'",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_RUNTIMEVARIABLES],
@@ -5163,6 +5308,10 @@ int ido2db_query_insert_or_update_runtimevariables_add(ido2db_idi *idi, void **d
                                         );
                 	        /* send query to db */
 	                        result = ido2db_db_query(idi, query2);	
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
         	                free(query2);
 			}
                 }
@@ -5355,6 +5504,10 @@ int ido2db_query_insert_or_update_hostdefinition_definition_add(ido2db_idi *idi,
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT host_id FROM %s WHERE instance_id=%lu AND config_type=%d AND host_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_HOSTS],
@@ -5445,6 +5598,10 @@ int ido2db_query_insert_or_update_hostdefinition_definition_add(ido2db_idi *idi,
                                         );
 	                        /* send query to db */
         	                result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
                 	        free(query2);
 			}
                 }
@@ -5926,6 +6083,10 @@ int ido2db_query_insert_or_update_hostdefinition_parenthosts_add(ido2db_idi *idi
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
                         dummy = asprintf(&query, "SELECT host_parenthost_id FROM %s WHERE host_id=%lu AND parent_host_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_HOSTPARENTHOSTS],
                                  *(unsigned long *) data[1],            /* unique constraint start */
@@ -5959,6 +6120,10 @@ int ido2db_query_insert_or_update_hostdefinition_parenthosts_add(ido2db_idi *idi
                                         );
                 	        /* send query to db */
 	                        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
         	                free(query2);
 			}
                 }
@@ -6080,6 +6245,10 @@ int ido2db_query_insert_or_update_hostdefinition_contactgroups_add(ido2db_idi *i
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT host_contactgroup_id FROM %s WHERE host_id=%lu AND contactgroup_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_HOSTCONTACTGROUPS],
@@ -6114,6 +6283,10 @@ int ido2db_query_insert_or_update_hostdefinition_contactgroups_add(ido2db_idi *i
                                         );
                 	        /* send query to db */
 	                        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
         	                free(query2);
 			}
                 }
@@ -6240,6 +6413,10 @@ int ido2db_query_insert_or_update_hostgroupdefinition_definition_add(ido2db_idi
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT hostgroup_id FROM %s WHERE instance_id=%lu AND hostgroup_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_HOSTGROUPS],
@@ -6275,6 +6452,10 @@ int ido2db_query_insert_or_update_hostgroupdefinition_definition_add(ido2db_idi
                                         );
                 	        /* send query to db */
                         	result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
 	                        free(query2);
 			}
                 }
@@ -6407,6 +6588,10 @@ int ido2db_query_insert_or_update_hostgroupdefinition_hostgroupmembers_add(ido2d
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT hostgroup_member_id FROM %s WHERE hostgroup_id=%lu AND host_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_HOSTGROUPMEMBERS],
@@ -6441,6 +6626,10 @@ int ido2db_query_insert_or_update_hostgroupdefinition_hostgroupmembers_add(ido2d
                                         );
                 	        /* send query to db */
                         	result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
 	                        free(query2);
 			}
                 }
@@ -6609,6 +6798,10 @@ int ido2db_query_insert_or_update_servicedefinition_definition_add(ido2db_idi *i
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT service_id FROM %s WHERE instance_id=%lu AND config_type=%d AND service_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_SERVICES],
@@ -6692,6 +6885,10 @@ int ido2db_query_insert_or_update_servicedefinition_definition_add(ido2db_idi *i
                                         );
 	                        /* send query to db */
         	                result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
                 	        free(query2);
 			}
                 }
@@ -7113,6 +7310,10 @@ int ido2db_query_insert_or_update_servicedefinition_contactgroups_add(ido2db_idi
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT service_contactgroup_id FROM %s WHERE service_id=%lu AND contactgroup_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_SERVICECONTACTGROUPS],
@@ -7147,6 +7348,10 @@ int ido2db_query_insert_or_update_servicedefinition_contactgroups_add(ido2db_idi
                                         );
                 	        /* send query to db */
 	                        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
         	                free(query2);
 			}
                 }
@@ -7273,6 +7478,10 @@ int ido2db_query_insert_or_update_servicegroupdefinition_definition_add(ido2db_i
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT servicegroup_id FROM %s WHERE instance_id=%lu AND config_type=%d AND servicegroup_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_SERVICEGROUPS],
@@ -7309,6 +7518,10 @@ int ido2db_query_insert_or_update_servicegroupdefinition_definition_add(ido2db_i
                                         );
                 	        /* send query to db */
 	                        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
         	                free(query2);
 			}
                 }
@@ -7441,6 +7654,10 @@ int ido2db_query_insert_or_update_servicegroupdefinition_members_add(ido2db_idi
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT servicegroup_member_id FROM %s WHERE servicegroup_id=%lu AND service_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_SERVICEGROUPMEMBERS],
@@ -7476,6 +7693,10 @@ int ido2db_query_insert_or_update_servicegroupdefinition_members_add(ido2db_idi
                                         );
 	                        /* send query to db */
         	                result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
 	                        free(query2);
 			}
                 }
@@ -7609,6 +7830,10 @@ int ido2db_query_insert_or_update_hostdependencydefinition_definition_add(ido2db
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT hostdependency_id FROM %s WHERE instance_id=%lu AND config_type=%d AND host_object_id=%lu AND dependent_host_object_id=%lu AND dependency_type=%d AND inherits_parent=%d AND fail_on_up=%d AND fail_on_down=%d AND fail_on_unreachable=%d",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_HOSTDEPENDENCIES],
@@ -7657,6 +7882,10 @@ int ido2db_query_insert_or_update_hostdependencydefinition_definition_add(ido2db
                                         );
 	                        /* send query to db */
         	                result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
                 	        free(query2);
 			}
                 }
@@ -7825,6 +8054,10 @@ int ido2db_query_insert_or_update_servicedependencydefinition_definition_add(ido
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT servicedependency_id FROM %s WHERE instance_id=%lu AND config_type=%d AND service_object_id=%lu AND dependent_service_object_id=%lu AND dependency_type=%d AND inherits_parent=%d AND fail_on_ok=%d AND fail_on_warning=%d AND fail_on_unknown=%d AND fail_on_critical=%d",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_SERVICEDEPENDENCIES],
@@ -7875,6 +8108,10 @@ int ido2db_query_insert_or_update_servicedependencydefinition_definition_add(ido
                                         );
 	                        /* send query to db */
         	                result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
                 	        free(query2);  
 			}
                 }
@@ -8047,6 +8284,10 @@ int ido2db_query_insert_or_update_hostescalationdefinition_definition_add(ido2db
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT hostescalation_id FROM %s WHERE instance_id=%lu AND config_type=%d AND host_object_id=%lu AND timeperiod_object_id=%lu AND first_notification=%d AND last_notification=%d",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_HOSTESCALATIONS],
@@ -8092,6 +8333,10 @@ int ido2db_query_insert_or_update_hostescalationdefinition_definition_add(ido2db
                                         );
 	                        /* send query to db */
         	                result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
                 	        free(query2);
 			}
                 }
@@ -8247,6 +8492,10 @@ int ido2db_query_insert_or_update_hostescalationdefinition_contactgroups_add(ido
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT hostescalation_contactgroup_id FROM %s WHERE hostescalation_id=%lu AND contactgroup_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_HOSTESCALATIONCONTACTGROUPS],
@@ -8281,6 +8530,10 @@ int ido2db_query_insert_or_update_hostescalationdefinition_contactgroups_add(ido
                                         );
                 	        /* send query to db */
 	                        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
         	                free(query2);
 			}
                 }
@@ -8404,6 +8657,10 @@ int ido2db_query_insert_or_update_hostescalationdefinition_contacts_add(ido2db_i
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
                         dummy = asprintf(&query, "SELECT hostescalation_contact_id FROM %s WHERE instance_id=%lu AND hostescalation_id=%lu AND contact_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_HOSTESCALATIONCONTACTS],
                                  *(unsigned long *) data[0],     /* unique constraint start */
@@ -8438,6 +8695,10 @@ int ido2db_query_insert_or_update_hostescalationdefinition_contacts_add(ido2db_i
                                         );
 	                        /* send query to db */
         	                result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
                 	        free(query2);
 			}
                 }
@@ -8574,6 +8835,10 @@ int ido2db_query_insert_or_update_serviceescalationdefinition_definition_add(ido
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
                         dummy = asprintf(&query, "SELECT serviceescalation_id FROM %s WHERE instance_id=%lu AND config_type=%d AND service_object_id=%lu AND timeperiod_object_id=%lu AND first_notification=%d AND last_notification=%d",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_SERVICEESCALATIONS],
                                  *(unsigned long *) data[0],            /* unique constraint start */
@@ -8619,6 +8884,10 @@ int ido2db_query_insert_or_update_serviceescalationdefinition_definition_add(ido
                                         );
                 	        /* send query to db */
 	                        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
         	                free(query2);
 			}
                 }
@@ -8780,6 +9049,10 @@ int ido2db_query_insert_or_update_serviceescalationdefinition_contactgroups_add(
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT serviceescalation_contactgroup_id FROM %s WHERE serviceescalation_id=%lu AND contactgroup_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_SERVICEESCALATIONCONTACTGROUPS],
@@ -8814,6 +9087,10 @@ int ido2db_query_insert_or_update_serviceescalationdefinition_contactgroups_add(
                                         );
                 	        /* send query to db */
 	                        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
         	                free(query2);
 			}
                 }
@@ -8938,6 +9215,10 @@ int ido2db_query_insert_or_update_serviceescalationdefinition_contacts_add(ido2d
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT serviceescalation_contact_id FROM %s WHERE instance_id=%lu AND serviceescalation_id=%lu AND contact_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_SERVICEESCALATIONCONTACTS],
@@ -8973,6 +9254,10 @@ int ido2db_query_insert_or_update_serviceescalationdefinition_contacts_add(ido2d
                                         );
 	                        /* send query to db */
         	                result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
                 	        free(query2);
 			}
                 }
@@ -9102,6 +9387,10 @@ int ido2db_query_insert_or_update_commanddefinition_definition_add(ido2db_idi *i
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT command_id FROM %s WHERE instance_id=%lu AND object_id=%lu AND config_type=%d",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_COMMANDS],
@@ -9138,6 +9427,10 @@ int ido2db_query_insert_or_update_commanddefinition_definition_add(ido2db_idi *i
                                         );
                 	        /* send query to db */
 	                        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
         	                free(query2);
 			}
                 }
@@ -9276,6 +9569,10 @@ int ido2db_query_insert_or_update_timeperiodefinition_definition_add(ido2db_idi
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
                         dummy = asprintf(&query, "SELECT timeperiod_id FROM %s WHERE instance_id=%lu AND config_type=%d AND timeperiod_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_TIMEPERIODS],
                                  *(unsigned long *) data[0],            /* unique constraint start */
@@ -9311,6 +9608,10 @@ int ido2db_query_insert_or_update_timeperiodefinition_definition_add(ido2db_idi
                                         );
                 	        /* send query to db */
 	                        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
         	                free(query2);
 			}
                 }
@@ -9445,6 +9746,10 @@ int ido2db_query_insert_or_update_timeperiodefinition_timeranges_add(ido2db_idi
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
                         dummy = asprintf(&query, "SELECT timeperiod_timerange_id FROM %s WHERE timeperiod_id=%lu AND day=%d AND start_sec=%lu AND end_sec=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_TIMEPERIODTIMERANGES],
                                  *(unsigned long *) data[1],    /* unique constraint start */
@@ -9482,6 +9787,10 @@ int ido2db_query_insert_or_update_timeperiodefinition_timeranges_add(ido2db_idi
                                         );
                 	        /* send query to db */
                         	result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
 	                        free(query2);
 			}
                 }
@@ -9634,6 +9943,10 @@ int ido2db_query_insert_or_update_contactdefinition_definition_add(ido2db_idi *i
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT contact_id FROM %s WHERE instance_id=%lu AND config_type=%d AND contact_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_CONTACTS],
@@ -9688,6 +10001,10 @@ int ido2db_query_insert_or_update_contactdefinition_definition_add(ido2db_idi *i
                                         );
                         	/* send query to db */
                 	        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
 	                        free(query2);
 			}
                 }
@@ -9923,6 +10240,10 @@ int ido2db_query_insert_or_update_contactdefinition_addresses_add(ido2db_idi *id
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT contactaddress_id FROM %s WHERE contact_id=%lu AND address_number=%d",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_CONTACTADDRESSES],
@@ -9958,6 +10279,10 @@ int ido2db_query_insert_or_update_contactdefinition_addresses_add(ido2db_idi *id
                                         );
                 	        /* send query to db */
 	                        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
         	                free(query2);
 			}
                 }
@@ -10092,6 +10417,10 @@ int ido2db_query_insert_or_update_contactdefinition_notificationcommands_add(ido
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
                         dummy = asprintf(&query, "SELECT contact_notificationcommand_id FROM %s WHERE instance_id=%lu AND contact_id=%lu AND notification_type=%d AND command_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_CONTACTNOTIFICATIONCOMMANDS],
                                  *(unsigned long *) data[0],     /* unique constraint start */
@@ -10129,6 +10458,10 @@ int ido2db_query_insert_or_update_contactdefinition_notificationcommands_add(ido
                                         );
                 	        /* send query to db */
                         	result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
 	                        free(query2);
 			}
                 }
@@ -10268,6 +10601,10 @@ int ido2db_query_insert_or_update_contactdefinition_servicenotificationcommands_
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT contact_notificationcommand_id FROM %s WHERE instance_id=%lu AND contact_id=%lu AND notification_type=%d AND command_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_CONTACTNOTIFICATIONCOMMANDS],
@@ -10306,6 +10643,10 @@ int ido2db_query_insert_or_update_contactdefinition_servicenotificationcommands_
                                         );
                 	        /* send query to db */
 	                        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
         	                free(query2);
 			}
                 }
@@ -10444,6 +10785,10 @@ int ido2db_query_insert_or_update_save_custom_variables_customvariables_add(ido2
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT customvariable_id FROM %s WHERE object_id=%lu AND varname='%s'",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_CUSTOMVARIABLES],
@@ -10481,6 +10826,10 @@ int ido2db_query_insert_or_update_save_custom_variables_customvariables_add(ido2
                                         );
 	                        /* send query to db */
         	                result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
                 	        free(query2);
 			}
                 }
@@ -10634,6 +10983,10 @@ int ido2db_query_insert_or_update_save_custom_variables_customvariablestatus_add
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT customvariablestatus_id FROM %s WHERE object_id=%lu AND varname='%s'",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_CUSTOMVARIABLESTATUS],
@@ -10670,6 +11023,10 @@ int ido2db_query_insert_or_update_save_custom_variables_customvariablestatus_add
                                         );
 	                        /* send query to db */
         	                result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
                 	        free(query2);
 			}
                 }
@@ -10832,6 +11189,10 @@ int ido2db_query_insert_or_update_contactgroupdefinition_definition_add(ido2db_i
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT contactgroup_id FROM %s WHERE instance_id=%lu AND config_type=%d AND contactgroup_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_CONTACTGROUPS],
@@ -10868,6 +11229,10 @@ int ido2db_query_insert_or_update_contactgroupdefinition_definition_add(ido2db_i
                                         );
                 	        /* send query to db */
 	                        result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
         	                free(query2);
 			}
                 }
@@ -11000,6 +11365,10 @@ int ido2db_query_insert_or_update_contactgroupdefinition_contactgroupmembers_add
 
                 /* check result if update was ok */
                 if (dbi_result_get_numrows_affected(idi->dbinfo.dbi_result) == 0) {
+			if (idi->dbinfo.dbi_result != NULL) {
+				dbi_result_free(idi->dbinfo.dbi_result);
+				idi->dbinfo.dbi_result = NULL;
+			}
 
                         dummy = asprintf(&query, "SELECT contactgroup_member_id FROM %s WHERE contactgroup_id=%lu AND contact_object_id=%lu",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_CONTACTGROUPMEMBERS],
@@ -11034,6 +11403,10 @@ int ido2db_query_insert_or_update_contactgroupdefinition_contactgroupmembers_add
                                         );
 	                        /* send query to db */
         	                result = ido2db_db_query(idi, query2);
+				if (idi->dbinfo.dbi_result != NULL) {
+					dbi_result_free(idi->dbinfo.dbi_result);
+					idi->dbinfo.dbi_result = NULL;
+				}
                 	        free(query2);
 			}
                 }