diff --git a/controllers/QuestsController.inc b/controllers/QuestsController.inc
index 63b8c8e6..bd7088dc 100644
--- a/controllers/QuestsController.inc
+++ b/controllers/QuestsController.inc
@@ -308,7 +308,9 @@
 					if(is_null($relatedQuesttext))
 					{
 						$nextQuestgroup = $this->Questgroups->getNextQuestgroup($questgroup['id']);
-						$nextQuestgroup['hierarchy'] = $this->Questgroupshierarchy->getHierarchyForQuestgroup($nextQuestgroup['id']);
+						if(!is_null($nextQuestgroup)) {
+							$nextQuestgroup['hierarchy'] = $this->Questgroupshierarchy->getHierarchyForQuestgroup($nextQuestgroup['id']);
+						}
 					}
 					else
 					{
diff --git a/views/html/quests/quest.tpl b/views/html/quests/quest.tpl
index 8a296a06..d2dcac7b 100644
--- a/views/html/quests/quest.tpl
+++ b/views/html/quests/quest.tpl
@@ -104,7 +104,7 @@
 </section>
 <?php endif ?>
 
-<?php if(!is_null($nextquests) || !is_null($nextquestgroup)) : ?>
+<?php if(count($nextquests) > 0 || !is_null($nextquestgroup)) : ?>
 <section>
 	<h1><?=_('Continuation')?></h1>
 	<?php if(count($nextquests) > 0) : ?>