diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index b9e99002f42d..9c037e92286d 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -795,6 +795,8 @@ class InvoiceController extends BaseController
 
         $file_path = $invoice->service()->getInvoicePdf($contact);
 
+nlog($file_path);
+
         return response()->download($file_path, basename($file_path));
     }
 
diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php
index 8d818643d6bb..ab0e0ee4b88f 100644
--- a/app/Models/BaseModel.php
+++ b/app/Models/BaseModel.php
@@ -191,7 +191,9 @@ class BaseModel extends Model
 
     public function numberFormatter()
     {
-        $formatted_number =  mb_ereg_replace("([^\w\s\d\-_~,;\[\]\(\).])", '', $this->number);
+        $number = strlen($this->number) > 1 ? $this->number : class_basename($this);
+
+        $formatted_number =  mb_ereg_replace("([^\w\s\d\-_~,;\[\]\(\).])", '', $number);
         // Remove any runs of periods (thanks falstro!)
         $formatted_number = mb_ereg_replace("([\.]{2,})", '', $formatted_number);