diff --git a/ChangeLog b/ChangeLog
index 56174bb4a..361612b5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2222344 [display] Query involving a function shown as binary
 + [lang] Italian update, thanks to fantu - fantu
 + [lang] Swedish update, thanks to Björn T. Hallberg
+- bug #2315549 [import] fclose() error with "Create PHP code"
 
 3.0.2.0 (not yet released)
 - [lang] Italian update, thanks to Luca and fantu
diff --git a/import.php b/import.php
index 6dc0c222f..7ada5ec30 100644
--- a/import.php
+++ b/import.php
@@ -350,7 +350,7 @@ if (!$error) {
     }
 }
 
-if (! $error && $import_handle !== FALSE) {
+if (! $error && FALSE !== $import_handle && NULL !== $import_handle) {
     fclose($import_handle);
 }