diff --git a/ldi_check.php3 b/ldi_check.php3
index 97c2c9682..30dc24e7c 100755
--- a/ldi_check.php3
+++ b/ldi_check.php3
@@ -31,7 +31,7 @@ if (isset($btnLDI) && ($textfile != 'none')) {
 
     // Kanji encoding convert appended by Y.Kawada
     if (function_exists('PMA_kanji_file_conv')) {
-        $textfile         = PMA_kanji_file_conv($textfile, $knjenc, $xkana);
+        $textfile         = PMA_kanji_file_conv($textfile, $knjenc, isset($xkana) ? $xkana : '');
     }
     // Formats the data posted to this script
     $textfile             = PMA_sqlAddslashes($textfile);
diff --git a/ldi_table.php3 b/ldi_table.php3
index 8454f8ad5..bf00ab582 100755
--- a/ldi_table.php3
+++ b/ldi_table.php3
@@ -66,6 +66,7 @@ if (function_exists('PMA_set_enc_form')) {
          . PMA_set_enc_form('            ')
          . '        </td>' . "\n"
          . '    </tr>' . "\n";
+} // end if
 ?>
     <tr>
         <td colspan="3" align="center"><?php print PMA_showDocuShort('L/O/LOAD_DATA.html'); ?></td>
diff --git a/sql.php3 b/sql.php3
index 1d3f770ab..2941ad97e 100755
--- a/sql.php3
+++ b/sql.php3
@@ -265,7 +265,8 @@ else {
     }
 
     // tmpfile remove after convert encoding appended by Y.Kawada
-    if (function_exists('PMA_kanji_file_conv') && file_exists($textfile)) {
+    if (function_exists('PMA_kanji_file_conv')
+        && (isset($textfile) && file_exists($textfile))) {
         unlink($textfile);
     }