diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
index bac3a88..fc9923a 100644
--- a/src/plugins/evolution/tracker-evolution-plugin.c
+++ b/src/plugins/evolution/tracker-evolution-plugin.c
@@ -109,18 +109,6 @@
  * during registration of accounts and folders). I know this is cruel. I know. */
 
 typedef struct {
-	TrackerSparqlConnection *connection;
-	gchar *sparql;
-	gboolean commit;
-	gint prio;
-	GMutex *mutex;
-	GCond *cond;
-	gboolean has_happened;
-	gpointer pool;
-	gboolean dont_free;
-} PoolItem;
-
-typedef struct {
 	GThreadPool *pool;
 	GList *items;
 	GMutex *mutex;
@@ -293,7 +281,6 @@ thread_pool_exec (gpointer data,
                   gpointer user_data)
 {
 	ThreadPool *pool = user_data;
-	PoolItem *item;
 	gboolean dying;
 
 	g_mutex_lock (pool->mutex);
@@ -304,9 +291,7 @@ thread_pool_exec (gpointer data,
 	if (!dying)
 		pool->func (data, pool->cancel);
 
-	item = data;
-	if (!item->dont_free)
-		pool->freeup (data, pool->cancel);
+	pool->freeup (data, pool->cancel);
 }
 
 static ThreadPool*
@@ -908,6 +893,13 @@ introduce_walk_folders_in_folder (TrackerMinerEvolution *self,
 		sqlite3_stmt *stmt = NULL;
 		GPtrArray *uids = g_ptr_array_new_with_free_func (g_free);
 
+		/* might happen when folder is not loaded/opened yet */
+		if (!priv->cached_folders || !g_hash_table_lookup (priv->cached_folders, iter->full_name)) {
+			iter = iter->next;
+			g_ptr_array_unref (uids);
+			continue;
+		}
+
 		did_work = TRUE;
 
 		query = sqlite3_mprintf ("SELECT uid FROM %Q "
@@ -1215,8 +1207,13 @@ introduce_store_deal_with_deleted (TrackerMinerEvolution *self,
 			uid     = (const gchar *) sqlite3_column_text (stmt, 0);
 			mailbox = (const gchar *) sqlite3_column_text (stmt, 1);
 
-			folder = g_hash_table_lookup (priv->cached_folders, mailbox);
+			folder = priv->cached_folders ? g_hash_table_lookup (priv->cached_folders, mailbox) : NULL;
 
+			/* might happen when folder is not loaded/opened yet */
+			if (!folder) {
+				more = FALSE;
+				break;
+			}
 
 			/* This is not a path but a URI, don't use the OS's
 			 * directory separator here */
@@ -1411,7 +1408,7 @@ register_walk_folders_in_folder (TrackerMinerEvolution *self,
 
 		priv->cached_folders = g_hash_table_new_full (g_str_hash, g_str_equal,
 		                                              (GDestroyNotify) g_free,
-		                                              (GDestroyNotify) NULL);
+		                                              (GDestroyNotify) g_object_unref);
 	}
 
 	/* Recursively walks all the folders in store */
@@ -1505,6 +1502,8 @@ unregister_on_get_folder (gchar       *uri,
 	g_free (info->account_uri);
 	g_object_unref (info->self);
 	g_free (info);
+
+	g_object_unref (folder);
 }
 
 static void
@@ -1753,7 +1752,9 @@ introduce_account_to (TrackerMinerEvolution *self,
 	mail_get_folderinfo (store, NULL, on_got_folderinfo_introduce, intro_info);
 #endif
 
+#ifndef EVOLUTION_SHELL_3_2
 	g_object_unref (store);
+#endif
 
 }
 
@@ -2085,7 +2086,9 @@ register_account (TrackerMinerEvolution *self,
 	mail_get_folderinfo (store, NULL, on_got_folderinfo_register, reg_info);
 #endif
 
+#ifndef EVOLUTION_SHELL_3_2
 	g_object_unref (store);
+#endif
 }
 
 #ifdef EVOLUTION_SHELL_3_2
@@ -2181,7 +2184,9 @@ unregister_account (TrackerMinerEvolution *self,
 	mail_get_folderinfo (store, NULL, on_got_folderinfo_unregister, reg_info);
 #endif
 
+#ifndef EVOLUTION_SHELL_3_2
 	g_object_unref (store);
+#endif
 }
 
 static void
