From fc41c2c33d4d317614f90e46440e46000c1369ca Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Fri, 19 Mar 2021 02:40:15 +0530
Subject: [PATCH] feat: added null check for previous Error

---
 app/controllers/shared/api.php   | 2 --
 src/Appwrite/GraphQL/Builder.php | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index a5a4c2210c..8dc0c097c7 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -122,8 +122,6 @@ App::shutdown(function ($utopia, $request, $response, $project, $events, $audits
     /** @var Appwrite\Event\Event $functions */
     /** @var bool $mode */
 
-    var_dump("*********** In api.php shutdown *************");
-
     if (!empty($events->getParam('event'))) {
         if(empty($events->getParam('payload'))) {
             $events->setParam('payload', $response->getPayload());
diff --git a/src/Appwrite/GraphQL/Builder.php b/src/Appwrite/GraphQL/Builder.php
index 1e933bf250..60c447f372 100644
--- a/src/Appwrite/GraphQL/Builder.php
+++ b/src/Appwrite/GraphQL/Builder.php
@@ -296,7 +296,7 @@ class Builder {
         $errorFormatter = function(Error $error) use ($isDevelopment, $version) {
             $formattedError = FormattedError::createFromException($error);
             /**  Previous error represents the actual error thrown by Appwrite server */
-            $previousError = $error->getPrevious();
+            $previousError = $error->getPrevious() ?? $error;
             $formattedError['code'] = $previousError->getCode();
             $formattedError['version'] = $version;
             if ($isDevelopment) {