MAGETWO-34991: Eliminate exceptions from the list Part2

Author: Yuri Kovsher

lib/internal/Magento/Framework/Webapi/ErrorProcessor.php

@@ -100,7 +100,9 @@ public function maskException(\Exception $exception)
         $isDevMode = $this->_appState->getMode() === State::MODE_DEVELOPER;
         $stackTrace = $isDevMode ? $exception->getTraceAsString() : null;
 
-        if ($exception instanceof LocalizedException) {
+        if ($exception instanceof WebapiException) {
+            $maskedException = $exception;
+        } elseif ($exception instanceof LocalizedException) {
             // Map HTTP codes for LocalizedExceptions according to exception type
             if ($exception instanceof NoSuchEntityException) {
                 $httpCode = WebapiException::HTTP_NOT_FOUND;
@@ -128,8 +130,6 @@ public function maskException(\Exception $exception)
                 $errors,
                 $stackTrace
             );
-        } elseif ($exception instanceof WebapiException) {
-            $maskedException = $exception;
         } else {
             $message = $exception->getMessage();
             $code = $exception->getCode();

lib/internal/Magento/Framework/Webapi/Rest/Request/Deserializer/Xml.php

@@ -87,7 +87,7 @@ public function deserialize($xmlRequestBody)
      */
     public function handleErrors($errorNumber, $errorMessage, $errorFile, $errorLine)
     {
-        if (is_null($this->_errorMessage)) {
+        if ($this->_errorMessage === null) {
             $this->_errorMessage = $errorMessage;
         } else {
             $this->_errorMessage .= $errorMessage;