diff --git a/models/TandemPair.class.php b/models/TandemPair.class.php
index 65833904a5953d2e686e9b03891cbc35e119a830..f86bcb3d9bf27ffec13089490466766db1b03e8d 100644
--- a/models/TandemPair.class.php
+++ b/models/TandemPair.class.php
@@ -161,6 +161,9 @@ require_once(__DIR__ . '/TerminatedTandemPair.class.php');
      */
     public function createTerminatedTandemPair()
     {
+        if (!$this->request->user_id || !$this->offer->user_id) {
+            return null;
+        }
         $terminated_pair = new TerminatedTandemPair();
         $terminated_pair->requester_user_id = $this->request->user_id;
         $terminated_pair->requester_level = $this->request->level;
diff --git a/plugin.manifest b/plugin.manifest
index 34af76d7fe8f4394e7364bbc064c02314d6c8ade..aac7d090d1d636b5ea59b89b48e0f8ee35e62b5a 100644
--- a/plugin.manifest
+++ b/plugin.manifest
@@ -1,7 +1,7 @@
 pluginname=TandemPlugin
 pluginclassname=TandemPlugin
 origin=data-quest
-version=1.0.7
+version=1.0.8
 description=Dieses Plugin ermöglicht es, Sprachtandems innerhalb der Stud.IP Platform zu bilden.
 studipMinVersion=4.0
 studipMaxVersion=4.99.99