Payload from exceptions fixed

baibaratsky · Mar 10, 2016 · 0cc3186 · 0cc3186
1 parent 203a8ed
commit 0cc3186
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ErrorHandlerTrait.php b/ErrorHandlerTrait.php
@@ -68,7 +68,11 @@ private function getPayloadData(\Exception $exception)
         if ($exception instanceof WithPayload) {
             $exceptionData = $exception->rollbarPayload();
             if (is_array($exceptionData)) {
-                $payloadData = ArrayHelper::merge($exceptionData, $payloadData);
+                if (is_null($payloadData)) {
+                    $payloadData = $exceptionData;
+                } else {
+                    $payloadData = ArrayHelper::merge($exceptionData, $payloadData);
+                }
             } elseif (!is_null($exceptionData)) {
                 throw new \Exception(get_class($exception) . '::rollbarPayload() returns an incorrect result');
             }