diff --git a/app/views/course/dates/export.php b/app/views/course/dates/export.php
index 7a8b70d082e8f0b680131f0efaf73e3bfa8d63a2..651c4074f082f30dd05f878559d001873bcb7267 100644
--- a/app/views/course/dates/export.php
+++ b/app/views/course/dates/export.php
@@ -19,18 +19,21 @@
         <?
         $all_semester = Semester::findAllVisible(false);
 
+        $grenze = 0;
         foreach ($dates as $date) :
             if ( ($grenze == 0) || ($grenze < $date['start']) ) {
                 foreach ($all_semester as $zwsem) {
-                    if ( ($zwsem['beginn'] < $date['start']) && ($zwsem['ende'] > $date['start']) ) {
-                        $grenze = $zwsem['ende'];
-                        ?>
-                        <tr>
-                            <td colspan="5">
-                                <h3><?= htmlReady($zwsem['name']) ?></h3>
-                            </td>
-                        </tr>
-                    <?
+                    if (!empty($zwsem['beginn'])) {
+                        if ( ($zwsem['beginn'] < $date['start']) && ($zwsem['ende'] > $date['start']) ) {
+                            $grenze = $zwsem['ende'];
+                            ?>
+                            <tr>
+                                <td colspan="5">
+                                    <h3><?= htmlReady($zwsem['name']) ?></h3>
+                                </td>
+                            </tr>
+                        <?
+                        }
                     }
                 }
             }
diff --git a/lib/raumzeit/Issue.php b/lib/raumzeit/Issue.php
index eeb38b3922d03b30d1e577f4443a93be379fc2d2..96222a56cbdc18cd7a6b8537d1b4b787ec36f2cc 100644
--- a/lib/raumzeit/Issue.php
+++ b/lib/raumzeit/Issue.php
@@ -62,10 +62,10 @@ class Issue {
     function __construct($data = []) {
         global $user;
 
-        if ($data['issue_id']) {
+        if (!empty($data['issue_id'])) {
             $this->issue_id = $data['issue_id'];
             $this->restore();
-        } else if ($data['seminar_id']) {
+        } else if (!empty($data['seminar_id'])) {
             $this->issue_id = md5(uniqid('Issue'));
             $this->seminar_id = $data['seminar_id'];
             $this->mkdate = time();
@@ -190,7 +190,7 @@ class Issue {
         $this->mkdate = $data['mkdate'];
         $this->chdate = $data['chdate'];
         $this->priority = $data['priority'];
-        $this->file = ($data['range_id'] == '') ? FALSE : TRUE;
+        $this->file = !empty($data['range_id']);
         if ($this->file) {
             $this->folder_id = $data['folder_id'];
         }