Merge pull request thedevdojo#957 from turtuga/menu_404_page

menu on 404 page
sornss · Mar 21, 2017 · 98eaf16 · 98eaf16
2 parents 6ca6f0d + df5996a
commit 98eaf16
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/VoyagerServiceProvider.php b/src/VoyagerServiceProvider.php
@@ -117,7 +117,11 @@ protected function registerViewComposers()
      */
     protected function addStorageSymlinkAlert()
     {
-        $currentRouteAction = app('router')->current()->getAction();
+        if (app('router')->current() !== null) {
+            $currentRouteAction = app('router')->current()->getAction();
+        } else  {
+            $currentRouteAction = null;
+        }
         $routeName = is_array($currentRouteAction) ? array_get($currentRouteAction, 'as') : null;
 
         if ($routeName != 'voyager.dashboard') {