diff --git a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
index 925d9b077ab2dc8309b28ab909089e8ffbbb151f..e731d46f66986cfb7b493632b7c6551d2ccc0c61 100644
--- a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
+++ b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
@@ -88,6 +88,7 @@
     "# Optional auxiliary devices\n",
     "use_ppu_device = ''  # Device ID for a pulse picker device to only process picked trains, empty string to disable\n",
     "ppu_train_offset = 0  # When using the pulse picker, offset between the PPU's sequence start and actually picked train\n",
+    "require_ppu_trigger = False  # Optional protection against running without PPU or without triggering trains.\n",
     "\n",
     "use_litframe_finder = 'off' # Process only illuminated frames: 'off' - disable, 'device' - use online device data, 'offline' - use offline algorithm, 'auto' - choose online/offline source automatically (default)\n",
     "litframe_device_id = '' # Device ID for a lit frame finder device, empty string to auto detection\n",
@@ -303,10 +304,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "if use_ppu_device:\n",
-    "    # Obtain trains to process if using a pulse picker device.\n",
+    "if use_ppu_device and use_ppu_device in dc.control_sources:\n",
+    "    # Obtain trains to process if using a pulse picker device and it's present.\n",
     "\n",
-    "    # Will throw an uncaught exception if the device is wrong.\n",
     "    seq_start = dc[use_ppu_device, 'trainTrigger.sequenceStart.value'].ndarray()\n",
     "\n",
     "    # The trains picked are the unique values of trainTrigger.sequenceStart\n",
@@ -320,18 +320,33 @@
     "        ].select_trains(by_id[[train_id]]).ndarray()[0]\n",
     "        train_ids.extend(list(range(train_id, train_id + n_trains)))\n",
     "\n",
-    "    print(f'PPU device {use_ppu_device} triggered for {len(train_ids)} train(s)')\n",
+    "    if train_ids:\n",
+    "        print(f'PPU device {use_ppu_device} triggered for {len(train_ids)} train(s)')\n",
+    "    elif require_ppu_trigger:\n",
+    "        raise RuntimeError(f'PPU device {use_ppu_device} not triggered but required, aborting!')\n",
+    "    else:\n",
+    "        print(f'PPU device {use_ppu_device} not triggered, processing all valid trains')\n",
+    "        train_ids = None\n",
+    "        \n",
+    "elif use_ppu_device:\n",
+    "    # PPU configured but not present.\n",
+    "    \n",
+    "    if require_ppu_trigger:\n",
+    "        raise RuntimeError(f'PPU device {use_ppu_device} required but not found, aborting!')\n",
+    "    else:\n",
+    "        print(f'PPU device {use_ppu_device} configured but not found, processing all valid trains')\n",
+    "        train_ids = None\n",
     "\n",
     "elif train_ids != [-1]:\n",
     "    # Specific trains passed by parameter, convert to ndarray.\n",
     "    train_ids = np.array(train_ids)\n",
     "    \n",
     "    print(f'Processing up to {len(train_ids)} manually selected train(s)')\n",
+    "\n",
     "else:\n",
-    "    # Process all trains.\n",
-    "    train_ids = None\n",
-    "    \n",
-    "    print(f'Processing all valid trains')"
+    "    # No PPU configured.\n",
+    "    print(f'Processing all valid trains')\n",
+    "    train_ids = None"
    ]
   },
   {