diff --git a/app/Exceptions/GracefulNotFoundHandler.php b/app/Exceptions/GracefulNotFoundHandler.php
index b46b0585f4..91df0dfd59 100644
--- a/app/Exceptions/GracefulNotFoundHandler.php
+++ b/app/Exceptions/GracefulNotFoundHandler.php
@@ -102,19 +102,17 @@ class GracefulNotFoundHandler extends ExceptionHandler
                 $request->session()->reflash();
 
                 return redirect(route('piggy-banks.index'));
-                break;
             case 'recurring.show':
+            case 'recurring.edit':
                 $request->session()->reflash();
 
                 return redirect(route('recurring.index'));
-                break;
             case 'tags.show.all':
             case 'tags.show':
             case 'tags.edit':
                 $request->session()->reflash();
 
                 return redirect(route('tags.index'));
-                break;
             case 'categories.show':
             case 'categories.show.all':
                 $request->session()->reflash();
diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php
index 01c1b2ef67..1d94838b01 100644
--- a/app/Http/Controllers/Recurring/EditController.php
+++ b/app/Http/Controllers/Recurring/EditController.php
@@ -86,6 +86,12 @@ class EditController extends Controller
      */
     public function edit(Request $request, Recurrence $recurrence)
     {
+        // TODO should be in repos
+        $count = $recurrence->recurrenceTransactions()->count();
+        if(0 === $count) {
+            throw new FireflyException('This recurring transaction has no meta-data. You will have to delete it and recreate it. Sorry!');
+        }
+
         /** @var RecurrenceTransformer $transformer */
         $transformer = app(RecurrenceTransformer::class);
         $transformer->setParameters(new ParameterBag);