diff --git a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
index fce32842c577c103839ec179f55a57076ffafeca..fc5a127e3dce19b441ffc1498d4ab29cdbe90a6c 100644
--- a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
+++ b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
@@ -279,15 +279,13 @@ class SchedulerModuleController
                             // Try adding or editing
                             $content .= $this->editTaskAction();
                             $sectionTitle = $this->getLanguageService()->getLL('action.' . $this->getCurrentAction());
+                        } catch (\LogicException|\UnexpectedValueException|\OutOfBoundsException $e) {
+                            // Catching all types of exceptions that were previously handled and
+                            // converted to messages
+                            $content .= $this->listTasksAction();
                         } catch (\Exception $e) {
-                            if ($e->getCode() === 1305100019) {
-                                // Invalid controller class name exception
-                                $this->addMessage($e->getMessage(), FlashMessage::ERROR);
-                            }
-                            // An exception may also happen when the task to
-                            // edit could not be found. In this case revert
-                            // to displaying the list of tasks
-                            // It can also happen when attempting to edit a running task
+                            // Catching all "unexpected" exceptions not previously handled
+                            $this->addMessage($e->getMessage(), FlashMessage::ERROR);
                             $content .= $this->listTasksAction();
                         }
                         break;