diff --git a/invoice.php b/invoice.php
index 70dffe0d..6294a33a 100644
--- a/invoice.php
+++ b/invoice.php
@@ -26,7 +26,12 @@ if (isset($_GET['invoice_id'])) {
     );
 
     if (mysqli_num_rows($sql) == 0) {
-        echo '<h1 class="text-secondary mt-5" style="text-align: center">Nothing to see here</h1>';
+        if (isset($_GET['client_id'])) {
+            $backlink_append = "?client_id=$client_id";
+        } else {
+            $backlink_append = '';
+        }
+        echo "<h1 class='text-secondary pt-5' style='text-align: center'>There is no Invoice here<br><small><a href='invoices.php$backlink_append'><i class='fas fa-arrow-left mr-2'></i>Back to Invoices</a></small></h1>";
         require_once "includes/footer.php";
 
         exit();
@@ -280,6 +285,10 @@ if (isset($_GET['invoice_id'])) {
                                         <i class="fa fa-fw fa-times mr-2"></i>Cancel
                                     </a>
                                 <?php } ?>
+                                <div class="dropdown-divider"></div>
+                                <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_invoice=<?php echo $invoice_id; ?>">
+                                    <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                </a>
                             </div>
                         </div>
 
diff --git a/recurring_invoice.php b/recurring_invoice.php
index 77419bfb..07aadd95 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -21,6 +21,18 @@ if (isset($_GET['recurring_invoice_id'])) {
         WHERE recurring_invoice_id = $recurring_invoice_id LIMIT 1"
     );
 
+    if (mysqli_num_rows($sql) == 0) {
+        if (isset($_GET['client_id'])) {
+            $backlink_append = "?client_id=$client_id";
+        } else {
+            $backlink_append = '';
+        }
+        echo "<h1 class='text-secondary pt-5' style='text-align: center'>There is no Recurring Invoice here<br><small><a href='recurring_invoices.php$backlink_append'><i class='fas fa-arrow-left mr-2'></i>Back to Recurring Invoices</a></small></h1>";
+        require_once "includes/footer.php";
+
+        exit();
+    }
+
     $row = mysqli_fetch_array($sql);
     $recurring_invoice_prefix = nullable_htmlentities($row['recurring_invoice_prefix']);
     $recurring_invoice_number = intval($row['recurring_invoice_number']);