Index: app/Http/Controllers/Dashboard/DepartmentsController.php
===================================================================
--- app/Http/Controllers/Dashboard/DepartmentsController.php	(revision 507ade0728433c541fa02eb3e11047124c57cadd)
+++ app/Http/Controllers/Dashboard/DepartmentsController.php	(revision 13ff930315cd09108f5ee4a5818a75aa33a3b6e1)
@@ -8,4 +8,5 @@
 use App\Models\Department;
 use App\Models\File;
+use App\Models\Folder;
 use App\Models\User;
 use App\Notifications\NewDepartmentCreated;
@@ -119,5 +120,20 @@
     public function downloadAll()
     {
-        try {
+        $departments = Department::all();
+        $flag=false;
+
+        foreach ($departments as $department) {
+                if($department->no_of_folders > 0) {
+                    $folders = Folder::where('department_id', $department->id)->get();
+                }
+                foreach ($folders as $folder){
+                    if($folder->no_of_files > 0){
+                        $flag=true;
+                        break;
+                    }
+                }
+        }
+
+            if($flag) {
             $zip_file = Storage::disk('uploads')->path('Departments.zip');
             $zip = new \ZipArchive();
@@ -141,17 +157,26 @@
             $headers = array('Content-Type' => 'application/octet-stream');
             $zip_new_name = Carbon::now()->format('d.m.Y - H:i') . '- Departments.zip';
-        }
-        catch(\Exception $e){
-            //abort(403, "No files found");
-            Alert::flash("All departments are empty", "warning");
-            return redirect()->back();
-    }
-        return response()->download($zip_file, $zip_new_name, $headers);
+            return response()->download($zip_file, $zip_new_name, $headers);
+                }
+
+            else {
+                Alert::flash("All departments are empty", "warning");
+                return redirect()->back();
+            }
     }
 
     public function downloadDepartment($id)
     {
-        try {
             $department = Department::find($id);
+            $folders = Folder::where('department_id', $id)->get();
+            $flag = false;
+
+            foreach($folders as $folder){
+                if($folder->no_of_files > 0)
+                    $flag=true;
+                    break;
+            }
+
+            if($flag) {
             $zip_file=Storage::disk('uploads')->path('Department.zip');
             $zip = new \ZipArchive();
@@ -174,10 +199,9 @@
             $zip_new_name = Carbon::now()->format('d.m.Y - H:i') . '- Departments.zip';
             return response()->download($zip_file, $zip_new_name, $headers);
-        }
-        catch(\Exception $e){
-            //abort(403, "No files found");
-            Alert::flash("This department has no files", "warning");
-            return redirect()->back();
-        }
+                }
+            else {
+                Alert::flash("This department has no files", "warning");
+                return redirect()->back();
+            }
     }
 }