diff --git a/lib/Magento/Image/Adapter/Gd2.php b/lib/Magento/Image/Adapter/Gd2.php
index 91d72e8b0c7b1..ef910372438a4 100644
--- a/lib/Magento/Image/Adapter/Gd2.php
+++ b/lib/Magento/Image/Adapter/Gd2.php
@@ -80,9 +80,14 @@ public function open($filename)
      */
     protected function _isMemoryLimitReached()
     {
-        $limit = $this->_convertToByte(ini_get('memory_limit'));
-        $requiredMemory = $this->_getImageNeedMemorySize($this->_fileName);
-        return (memory_get_usage(true) + $requiredMemory) > $limit;
+        $memory_limit = ini_get('memory_limit');
+        if ($memory_limit == -1) {
+          return false;
+        } else {
+          $limit = $this->_convertToByte($memory_limit);
+          $requiredMemory = $this->_getImageNeedMemorySize($this->_fileName);
+          return (memory_get_usage(true) + $requiredMemory) > $limit;
+        }
     }
 
     /**
@@ -112,7 +117,7 @@ protected function _getImageNeedMemorySize($file)
     }
 
     /**
-     * Converts memory value (e.g. 64M, 129KB) to bytes.
+     * Converts memory value (e.g. 64M, 129K) to bytes.
      * Case insensitive value might be used.
      *
      * @param string $memoryValue
@@ -124,7 +129,7 @@ protected function _convertToByte($memoryValue)
             return (int)$memoryValue * pow(1024, 3);
         } elseif (stripos($memoryValue, 'M') !== false) {
             return (int)$memoryValue * 1024 * 1024;
-        } elseif (stripos($memoryValue, 'KB') !== false) {
+        } elseif (stripos($memoryValue, 'K') !== false) {
             return (int)$memoryValue * 1024;
         }