diff --git a/views/exercises/cloze_exercise/solve.php b/views/exercises/cloze_exercise/solve.php
index 9a84f04f528e297333ad398b840d0721f54a0bc3..6f7ef239ab8b780ceb7ce1209c4cc5b7b0c9506a 100644
--- a/views/exercises/cloze_exercise/solve.php
+++ b/views/exercises/cloze_exercise/solve.php
@@ -23,7 +23,7 @@
                 </select><!--
             <? else: ?>
              --><input type="text" class="character_input cloze_input" name="answer[<?= $blank ?>]"
-                       style="width: <?= $exercise->getInputWidth($blank) ?>em;" value="<?= htmlReady($response[$blank]) ?>"><!--
+                       style="width: <?= $exercise->getInputWidth($blank) ?>em;" value="<?= htmlReady(isset($response[$blank]) ? $response[$blank] : '') ?>"><!--
             <? endif ?>
         <? endif ?>
     <? endforeach ?>
diff --git a/views/exercises/tb_exercise/correct.php b/views/exercises/tb_exercise/correct.php
index 8508a466d0e62bfbc0f61d94604ccfa1d2b3de23..181c556a072cecd995ef0d5a1c82e0e1400a7c40 100644
--- a/views/exercises/tb_exercise/correct.php
+++ b/views/exercises/tb_exercise/correct.php
@@ -21,7 +21,7 @@
         </ul>
 
         <div id="commented-<?= $exercise->id ?>">
-            <? if ($!empty(edit_solution)): ?>
+            <? if (!empty($edit_solution)): ?>
                 <? if ($exercise->getLayout() === 'markup'): ?>
                     <? $answer = $response[0] ?>
                 <? elseif ($exercise->getLayout() === 'code'): ?>
@@ -66,7 +66,7 @@
                 <? endif ?>
             </div>
 
-            <? if ($edit_solution): ?>
+            <? if (!empty($edit_solution)): ?>
                 <?= Studip\Button::create(_vips('Lösung bearbeiten'), 'edit_solution', ['class' => 'edit_solution']) ?>
 
                 <? if ($exercise->getLayout() === 'code'): ?>
diff --git a/views/exercises/tb_exercise/solve.php b/views/exercises/tb_exercise/solve.php
index bdb807dc9b4468cc2061a690b3b22071f4813600..84c3b69050188643a1d9349e70c8f0530b9cd21a 100644
--- a/views/exercises/tb_exercise/solve.php
+++ b/views/exercises/tb_exercise/solve.php
@@ -1,5 +1,5 @@
 <? if ($exercise->getLayout() !== 'none'): ?>
-    <? if ($exercise->task['template'] != ''): ?>
+    <? if (!empty($exercise->task['template'])): ?>
         <div class="vips_tabs">
             <ul>
                 <li>
@@ -20,7 +20,7 @@
 
             <? /* student answer */ ?>
             <div id="solution-<?= $exercise->id ?>">
-                <? $answer = isset($response) ? $response[0] : $exercise->task['template'] ?>
+                <? $answer = isset($response) ? $response[0] : (isset($exercise->task['template']) ? $exercise->task['template'] : '') ?>
                 <? if ($exercise->getLayout() === 'markup'): ?>
                     <textarea name="answer[0]" class="character_input size-l wysiwyg" data-editor="removePlugins=studip-quote,studip-upload,ImageUpload" rows="20"><?= wysiwygReady($answer) ?></textarea>
                 <? elseif ($exercise->getLayout() === 'code'): ?>
@@ -35,7 +35,7 @@
                 <? endif ?>
             </div>
 
-    <? if ($exercise->task['template'] == ''): ?>
+    <? if (empty($exercise->task['template'])): ?>
         </label>
     <? else: ?>
             <? /* default answer */ ?>