diff --git a/libraries/plugins/transformations/Text_Plain_BinaryToIP.class.php b/libraries/plugins/transformations/output/Text_Plain_BinaryToIP.class.php
similarity index 93%
rename from libraries/plugins/transformations/Text_Plain_BinaryToIP.class.php
rename to libraries/plugins/transformations/output/Text_Plain_BinaryToIP.class.php
index 5ca6f93369..0b2bf21138 100644
--- a/libraries/plugins/transformations/Text_Plain_BinaryToIP.class.php
+++ b/libraries/plugins/transformations/output/Text_Plain_BinaryToIP.class.php
@@ -49,7 +49,10 @@ class Text_Plain_BinaryToIP extends TransformationsPlugin
     {
         $length = strlen($buffer);
         if ($length == 4 || $length == 16) {
-            return inet_ntop(pack('A' . $length, $buffer));
+            $val = @inet_ntop(pack('A' . $length, $buffer));
+            if ($val !== false) {
+                return $val;
+            }
         }
         return $buffer;
     }
diff --git a/test/libraries/PMA_transformation_test.php b/test/libraries/PMA_transformation_test.php
index aecbc3ac58..18e17b62f3 100644
--- a/test/libraries/PMA_transformation_test.php
+++ b/test/libraries/PMA_transformation_test.php
@@ -129,15 +129,15 @@ class PMA_Transformation_Test extends PHPUnit_Framework_TestCase
                     3 => 'output/Image_JPEG_Link.class.php',
                     4 => 'output/Image_PNG_Inline.class.php',
                     5 => 'output/Text_Octetstream_Sql.class.php',
-                    6 => 'output/Text_Plain_Bool2text.class.php',
-                    7 => 'output/Text_Plain_Dateformat.class.php',
-                    8 => 'output/Text_Plain_External.class.php',
-                    9 => 'output/Text_Plain_Formatted.class.php',
-                    10 => 'output/Text_Plain_Imagelink.class.php',
-                    11 => 'output/Text_Plain_Json.class.php',
-                    12 => 'output/Text_Plain_Sql.class.php',
-                    13 => 'output/Text_Plain_Xml.class.php',
-                    14 => 'Text_Plain_BinaryToIP.class.php',
+                    6 => 'output/Text_Plain_BinaryToIP.class.php',
+                    7 => 'output/Text_Plain_Bool2text.class.php',
+                    8 => 'output/Text_Plain_Dateformat.class.php',
+                    9 => 'output/Text_Plain_External.class.php',
+                    10 => 'output/Text_Plain_Formatted.class.php',
+                    11 => 'output/Text_Plain_Imagelink.class.php',
+                    12 => 'output/Text_Plain_Json.class.php',
+                    13 => 'output/Text_Plain_Sql.class.php',
+                    14 => 'output/Text_Plain_Xml.class.php',
                     15 => 'Text_Plain_Link.class.php',
                     16 => 'Text_Plain_Longtoipv4.class.php',
                     17 => 'Text_Plain_Preappend.class.php',
@@ -150,7 +150,6 @@ class PMA_Transformation_Test extends PHPUnit_Framework_TestCase
                     'Text/Plain: Regexvalidation',
                     'Text/Plain: SqlEditor',
                     'Text/Plain: XmlEditor',
-                    'Text/Plain: BinaryToIP',
                     'Text/Plain: Link',
                     'Text/Plain: Longtoipv4',
                     'Text/Plain: Preappend',
@@ -163,7 +162,6 @@ class PMA_Transformation_Test extends PHPUnit_Framework_TestCase
                     'input/Text_Plain_Regexvalidation.class.php',
                     'input/Text_Plain_SqlEditor.class.php',
                     'input/Text_Plain_XmlEditor.class.php',
-                    'Text_Plain_BinaryToIP.class.php',
                     'Text_Plain_Link.class.php',
                     'Text_Plain_Longtoipv4.class.php',
                     'Text_Plain_Preappend.class.php',