diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc
index 8555c7849d6..f80a9bd93aa 100644
--- a/storage/innobase/dict/dict0load.cc
+++ b/storage/innobase/dict/dict0load.cc
@@ -1054,7 +1054,7 @@ next:
 		look to see if it is already in the tablespace cache. */
 		if (fil_space_for_table_exists_in_mem(
 			    space_id, table_name.m_name, flags)) {
-			continue;
+			goto next;
 		}
 
 		char*	filepath = fil_make_filepath(
@@ -1073,8 +1073,8 @@ next:
 
 		max_space_id = ut_max(max_space_id, space_id);
 
-		ut_free(table_name.m_name);
 		ut_free(filepath);
+		goto next;
 	}
 
 	mtr_commit(&mtr);