2 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 5585a8075f..64e4c5726e 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -184,8 +184,14 @@ if (!$get_info)
 			'extensions',
 			'extension_groups'
 		);
+
+		$src_db->sql_freeresult($result);
 	}
-	$src_db->sql_freeresult($result);
+	elseif ($result)
+	{
+		$src_db->sql_freeresult($result);
+	}
+	
 
 	/**
 	* Tests for further MODs can be included here.
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index c5a6df33b6..455f8841ad 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -1247,7 +1247,6 @@ class install_convert extends module
 					if (!$convert_row)
 					{
 						// move to the next batch or table
-						$src_db->sql_freeresult($___result);
 						break;
 					}