diff --git a/ChangeLog b/ChangeLog
index b63733c840..3054cfd51f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@ phpMyAdmin - ChangeLog
 - issue #13327 Fixed Incorrect NavigationTreeEnableExpansion default value in the documentation
 - issue #13008 Fixed export of database with a lot of tables
 - issue #13318 Improved performance when importing with enabled tracking
+- issue #13386 Avoid PHP errors with non existing configuration on OS X
+- issue #13388 Show only supported charsets for conversion
 
 4.7.1 (2017-05-25)
 - issue #13132 Always execute tracking queries as controluser
diff --git a/libraries/Config.php b/libraries/Config.php
index 0c19bd70f2..a52d8fbe16 100644
--- a/libraries/Config.php
+++ b/libraries/Config.php
@@ -1137,7 +1137,7 @@ class Config
     public function checkPermissions()
     {
         // Check for permissions (on platforms that support it):
-        if ($this->get('CheckConfigurationPermissions')) {
+        if ($this->get('CheckConfigurationPermissions') && @file_exists($this->getSource())) {
             $perms = @fileperms($this->getSource());
             if (!($perms === false) && ($perms & 2)) {
                 // This check is normally done after loading configuration
diff --git a/libraries/Encoding.php b/libraries/Encoding.php
index 700c40c324..8157e1e422 100644
--- a/libraries/Encoding.php
+++ b/libraries/Encoding.php
@@ -325,4 +325,20 @@ class Encoding
             . '</label><br />'
             . '</li></ul>';
     }
-}
\ No newline at end of file
+
+    public static function listEncodings()
+    {
+        if (is_null(self::$_engine)) {
+            self::initEngine();
+        }
+        /* Most engines do not support listing */
+        if (self::$_engine != self::ENGINE_MB) {
+            return $GLOBALS['cfg']['AvailableCharsets'];
+        }
+
+        return array_intersect(
+            array_map('strtolower', mb_list_encodings()),
+            $GLOBALS['cfg']['AvailableCharsets']
+        );
+    }
+}
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 36f2d77b15..c4a1614e41 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -639,7 +639,7 @@ function PMA_getHtmlForExportOptionsOutputCharset()
     $html = '        <li><label for="select_charset" class="desc">'
         . __('Character set of the file:') . '</label>' . "\n";
     $html .= '<select id="select_charset" name="charset" size="1">';
-    foreach ($cfg['AvailableCharsets'] as $temp_charset) {
+    foreach (Encoding::listEncodings() as $temp_charset) {
         $html .= '<option value="' . $temp_charset . '"';
         if (isset($_GET['charset'])
             && ($_GET['charset'] != $temp_charset)
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index a0a5fcf66a..fec77160df 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -181,7 +181,7 @@ function PMA_getHtmlForImportCharset()
         $html .= '<label for="charset_of_file">' . __('Character set of the file:')
             . '</label>';
         $html .= '<select id="charset_of_file" name="charset_of_file" size="1">';
-        foreach ($cfg['AvailableCharsets'] as $temp_charset) {
+        foreach (Encoding::listEncodings() as $temp_charset) {
             $html .= '<option value="' . htmlentities($temp_charset) .  '"';
             if ((empty($cfg['Import']['charset']) && $temp_charset == 'utf-8')
                 || $temp_charset == $cfg['Import']['charset']
diff --git a/test/classes/EncodingTest.php b/test/classes/EncodingTest.php
index 01a5c54f8d..98afc6bc83 100644
--- a/test/classes/EncodingTest.php
+++ b/test/classes/EncodingTest.php
@@ -203,4 +203,10 @@ class EncodingTest extends PHPUnit_Framework_TestCase
             $actual
         );
     }
+
+    public function testListEncodings()
+    {
+        $result = Encoding::listEncodings();
+        $this->assertContains('utf-8', $result);
+    }
 }