From ad8bd3eda549e7aa2b5ebddf9cbbe0af7fe3b5e9 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 30 Apr 2017 12:16:10 +0300
Subject: [PATCH] Handle missing logo file

---
 app/Models/Traits/HasLogo.php        | 4 ++++
 app/Providers/AppServiceProvider.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Models/Traits/HasLogo.php b/app/Models/Traits/HasLogo.php
index f3782d2937ec..6caf188ec009 100644
--- a/app/Models/Traits/HasLogo.php
+++ b/app/Models/Traits/HasLogo.php
@@ -58,6 +58,10 @@ trait HasLogo
 
         $disk = $this->getLogoDisk();
 
+        if (! $disk->exists($this->logo)) {
+            return null;
+        }
+
         return $disk->get($this->logo);
     }
 
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 1a11e06b2071..518076901af9 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -28,7 +28,7 @@ class AppServiceProvider extends ServiceProvider
                 $contents = $image;
             }
 
-            return 'data:image/jpeg;base64,' . base64_encode($contents);
+            return $contents ? 'data:image/jpeg;base64,' . base64_encode($contents) : '';
         });
 
         Form::macro('nav_link', function ($url, $text) {