diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index 8ee5573f0d..891054af30 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -843,8 +843,12 @@ class InvoiceController extends BaseController
     {
         $file_path = $invoice->service()->getInvoiceDeliveryNote($invoice, $invoice->invitations->first()->contact);
         
-        $file = base_path("storage/app/public/{$file_path}");
+        try {
+            $file = base_path("public/storage/{$file_path}");
 
-        return response()->download($file, basename($file));
+            return response()->download($file, basename($file));
+        } catch(\Exception $e) {
+            return response(['message' => 'Oops, something went wrong. Make sure you have symlink to storage/ in public/ directory.'], 500);
+        }
     }
 }
diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php
index f4897c8aa9..3c5115facb 100644
--- a/app/Services/PdfMaker/Design.php
+++ b/app/Services/PdfMaker/Design.php
@@ -192,6 +192,13 @@ class Design extends BaseDesign
 
         $elements = [];
 
+        // We don't want to show account balance or invoice total on PDF.. or any amount with currency.
+        if ($this->type == 'delivery_note') {
+            $variables = array_filter($variables, function ($m) {
+                return !in_array($m, ['$invoice.balance_due', '$invoice.total']);
+            });
+        }
+
         foreach ($variables as $variable) {
             $_variable = explode('.', $variable)[1];
             $_customs = ['custom1', 'custom2', 'custom3', 'custom4'];