diff --git a/src/Controller/SafetyController.php b/src/Controller/SafetyController.php
index 083b29c..b2f2f00 100644
--- a/src/Controller/SafetyController.php
+++ b/src/Controller/SafetyController.php
@@ -85,7 +85,7 @@ class SafetyController extends AbstractController
                     {
                         $nextTopic = $contentFile['Cards'][$arrayKeys[$cardIndex]][$i+1];
                     }
-                    else if($cardIndex < count($contentFile['Cards'])) //Next topic is not in same card, or does not exist
+                    else if($cardIndex < count($contentFile['Cards'])-1) //Next topic is not in same card, or does not exist
                     {
                         $nextTopic = $contentFile['Cards'][$arrayKeys[$cardIndex+1]][0]; //Set to first entry in next card
                     }