diff --git a/src/structure/components/com_sportsmanager/admin.php b/src/structure/components/com_sportsmanager/admin.php
index 1c8cf42..ae80b43 100644
--- a/src/structure/components/com_sportsmanager/admin.php
+++ b/src/structure/components/com_sportsmanager/admin.php
@@ -7473,6 +7473,13 @@ function adminVerbandsorganMitglieder(): void
 
 	$id = $jInput->get('id', 0, 'INT');
 
+	$query = "SELECT * FROM #__sportsmanager_verbandsorgane WHERE verbandsorgane_id = $id";
+	$verbandsorgane = loadObjectList($db, $query);
+	if (count($verbandsorgane) < 1) {
+		abortWithError("Wrong id!");
+	}
+	$verbandsorgan = $verbandsorgane[0];
+
     $query = "SELECT t2.*, t1.verbandsorgan"
 		. "\n FROM #__sportsmanager_verbandsorgane t1"
 		. "\n LEFT JOIN #__sportsmanager_mitglied_von_verbandsorgan t2 ON t2.verbandsorgane_id = t1.verbandsorgane_id"
@@ -7480,10 +7487,7 @@ function adminVerbandsorganMitglieder(): void
 		. "\n ORDER BY t2.reihenfolge, t2.nachname, t2.vorname;";
     $rows = loadObjectList($db, $query);
 	
-	$query = "SELECT * FROM #__sportsmanager_verbandsorgane WHERE verbandsorgane_id = $id";
-	$verbandsorgane = loadObjectList($db, $query);
-	
-    HTML_sportsmanager_admin::adminVerbandsorganMitglieder($rows,$verbandsorgane[0]);
+    HTML_sportsmanager_admin::adminVerbandsorganMitglieder($rows,$verbandsorgan);
 }
 
 function adminEditVerbandsorganMitglied(): void
@@ -7502,18 +7506,25 @@ function adminEditVerbandsorganMitglied(): void
     else {
         $query = "SELECT * FROM #__sportsmanager_mitglied_von_verbandsorgan WHERE mitglied_von_verbandsorgan_id = $id";
         $rows = loadObjectList($db, $query);
-        $row = $rows[0];
+		if (count($rows) < 1) {
+			abortWithError("Wrong id!");
+		}
+		$row = $rows[0];
     }
 
 	$query = "SELECT * FROM #__sportsmanager_verbandsorgane WHERE verbandsorgane_id = $verbandsorgane_id";
-	$verbandsorgane = loadObjectList($db, $query);
+	$rows = loadObjectList($db, $query);
+    if (count($rows) < 1) {
+        abortWithError("Wrong id!");
+    }
+    $verbandsorgan = $rows[0];
 
     $query = "SELECT spieler_id, CONCAT(nachname, ', ', vorname, ' (', spielernr, ')') AS spieler"
         . "\n FROM #__sportsmanager_spieler"
         . "\n ORDER BY nachname, vorname, spielernr";
     $spieler = loadObjectList($db, $query);
 
-    HTML_sportsmanager_admin::adminEditVerbandsorganMitglied($row,$verbandsorgane[0],$spieler);
+    HTML_sportsmanager_admin::adminEditVerbandsorganMitglied($row,$verbandsorgan,$spieler);
 }
 
 #[NoReturn] function adminSaveVerbandsorganMitglied(): void
diff --git a/src/structure/components/com_sportsmanager/database/update.php b/src/structure/components/com_sportsmanager/database/update.php
index e804127..c4022fb 100644
--- a/src/structure/components/com_sportsmanager/database/update.php
+++ b/src/structure/components/com_sportsmanager/database/update.php
@@ -5570,7 +5570,7 @@ function updateDatabase(): void
 
     if ($datenbank_version < 118) {
 
-		$query = "CREATE TABLE `stfv_sportsmanager_verbandsorgane` ("
+		$query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_verbandsorgane` ("
 			. "\n `verbandsorgane_id` int(11) NOT NULL AUTO_INCREMENT,"
 			. "\n `veranstalter_id` int(11) DEFAULT NULL,"
 			. "\n `verbandsorgan` varchar(32) DEFAULT NULL,"
@@ -5586,7 +5586,7 @@ function updateDatabase(): void
             die($db->stderr(true));
         }
 		
-		$query = "CREATE TABLE `stfv_sportsmanager_mitglied_von_verbandsorgan` ("
+		$query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_mitglied_von_verbandsorgan` ("
 			. "\n `mitglied_von_verbandsorgan_id` int(11) NOT NULL AUTO_INCREMENT,"
 			. "\n `verbandsorgane_id` int(11) DEFAULT NULL,"
 			. "\n `funktion` varchar(32) DEFAULT NULL,"
diff --git a/src/structure/components/com_sportsmanager/sportsmanager.php b/src/structure/components/com_sportsmanager/sportsmanager.php
index 484d2a8..9242c6c 100644
--- a/src/structure/components/com_sportsmanager/sportsmanager.php
+++ b/src/structure/components/com_sportsmanager/sportsmanager.php
@@ -4311,7 +4311,11 @@ function verbandsorganeDetails($uebergabe_id = 0): void
 		$id = $uebergabe_id;
 
 	$query = "SELECT * FROM #__sportsmanager_verbandsorgane WHERE verbandsorgane_id = $id";
-	$verbandsorgane = loadObjectList($db, $query);
+    $rows = loadObjectList($db, $query);
+    if (count($rows) < 1) {
+        abortWithError("Wrong id!");
+    }
+    $verbandsorgan = $rows[0];
 
 	$query = "SELECT * FROM #__sportsmanager_mitglied_von_verbandsorgan"
 		. "\n WHERE verbandsorgane_id = $id"
@@ -4331,7 +4335,7 @@ function verbandsorganeDetails($uebergabe_id = 0): void
     if (isJson()) {
         echo json_encode($mitglieder);
     } else {
-        HTML_sportsmanager::verbandsorganeDetails($params->get('titel'), $params->get('beschreibung'), $verbandsorgane[0], $mitglieder, $erweiterte_anzeige, $zusatzinfos_vorhanden);
+        HTML_sportsmanager::verbandsorganeDetails($params->get('titel'), $params->get('beschreibung'), $verbandsorgan, $mitglieder, $erweiterte_anzeige, $zusatzinfos_vorhanden);
     }
 }
 
diff --git a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php
index 030b057..de8eda5 100644
--- a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php
+++ b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php
@@ -7620,7 +7620,7 @@ class HTML_sportsmanager_admin
 						<td nowrap>
 							<input class="inputbox" type="text" name="verbandsorgan"
 								   id="association_body" size="50" maxlength="32"
-								   value="<?php echo htmlentities_utf8($row->verbandsorgan); ?>"/>
+								   value="<?php echo $row != null ? htmlentities_utf8($row->verbandsorgan) : ''; ?>"/>
 						</td>
 					</tr>
 					<tr>
@@ -7681,7 +7681,7 @@ class HTML_sportsmanager_admin
 						<td nowrap>
 							<input class="inputbox" type="text" name="email"
 								   id="email" size="50" maxlength="64"
-								   value="<?php echo htmlentities_utf8($row->email); ?>"/>
+								   value="<?php echo $row != null ? htmlentities_utf8($row->email) : ''; ?>"/>
 						</td>
 					</tr>
 					<tr>
@@ -7692,7 +7692,7 @@ class HTML_sportsmanager_admin
 						</td>
 						<td nowrap>
 							<textarea name="beschreibung" id="description" cols="80" rows="12"
-							title="<?php echo Text::_('COM_SPORTSMANAGER_USE_HTML'); ?>"><?php echo htmlentities_utf8($row->beschreibung); ?></textarea>
+							title="<?php echo Text::_('COM_SPORTSMANAGER_USE_HTML'); ?>"><?php echo $row != null ? htmlentities_utf8($row->beschreibung) : ''; ?></textarea>
 						</td>
 					</tr>
 					<tr>
@@ -7715,7 +7715,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
         global $params;
         ?>
         <div
-            class="componentheading<?php echo $params->get('pageclass_sfx'); ?>"><?php echo $verbandsorgan->verbandsorgan; ?>
+            class="componentheading<?php echo $params->get('pageclass_sfx'); ?>"><?php echo htmlentities_utf8($verbandsorgan->verbandsorgan); ?>
             : <?php echo Text::_('COM_SPORTSMANAGER_JOOMLA_MANAGEMENT'); ?></div>
 		<table style="border-spacing: 10px">
             <tr>
@@ -7763,7 +7763,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
                         </td>
 						<td nowrap><small><a
 									href="<?php echo SportsManagerURL('&task=admin_verbandsorgan_mitglied_remove&id=' . $row->mitglied_von_verbandsorgan_id . '&verbandsorgane_id=' .  $row->verbandsorgane_id); ?>"
-									onclick="return confirm('<?php echo Text::_('COM_SPORTSMANAGER_REALLY_REMOVE_ASSOCIATION_BODY'); ?>');"
+									onclick="return confirm('<?php echo Text::_('COM_SPORTSMANAGER_REALLY_REMOVE_ASSOCIATION_BODY_MEMBER'); ?>');"
 									title="<?php echo Text::_('COM_SPORTSMANAGER_REMOVE'); ?>">X</a></small>
 						</td>
                     </tr>
@@ -7814,7 +7814,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 								   name="nachname"
 								   id="lastname" size="50"
 								   maxlength="30"
-								   value="<?php echo $row->nachname; ?>"/>
+								   value="<?php echo $row != null ? $row->nachname : ''; ?>"/>
 						</td>
 					</tr>
 					<tr>
@@ -7828,7 +7828,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 								   name="vorname"
 								   id="firstname" size="50"
 								   maxlength="30"
-								   value="<?php echo $row->vorname; ?>"/>
+								   value="<?php echo $row != null ? $row->vorname : ''; ?>"/>
 						</td>
 					</tr>
 					<tr>
@@ -7841,7 +7841,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 								   name="telefon"
 								   id="telephone" size="50"
 								   maxlength="25"
-								   value="<?php echo $row->telefon; ?>"/>
+								   value="<?php echo $row != null ? $row->telefon : ''; ?>"/>
 						</td>
 					</tr>
 					<tr>
@@ -7854,7 +7854,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 								   name="mobil"
 								   id="mobile" size="50"
 								   maxlength="25"
-								   value="<?php echo $row->mobil; ?>"/>
+								   value="<?php echo $row != null ? $row->mobil : ''; ?>"/>
 						</td>
 					</tr>
 					<tr>
@@ -7867,7 +7867,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 								   name="email"
 								   id="email" size="50"
 								   maxlength="64"
-								   value="<?php echo $row->email; ?>"/>
+								   value="<?php echo $row != null ? $row->email : ''; ?>"/>
 						</td>
 					</tr>
 					<tr>
@@ -7880,7 +7880,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 								   name="funktion"
 								   id="function" size="50"
 								   maxlength="64"
-								   value="<?php echo $row->funktion; ?>"/>
+								   value="<?php echo $row != null ? $row->funktion : ''; ?>"/>
 						</td>
 					</tr>
 					<tr>
@@ -7893,7 +7893,7 @@ static function adminVerbandsorganMitglieder($rows,$verbandsorgan): void
 								   name="zusatzinfo"
 								   id="add_info" size="50"
 								   maxlength="64"
-								   value="<?php echo $row->zusatzinfo; ?>"/>
+								   value="<?php echo $row != null ? $row->zusatzinfo : ''; ?>"/>
 						</td>
 					</tr>
 					<tr>
diff --git a/src/structure/language/de-DE/de-DE.com_sportsmanager.ini b/src/structure/language/de-DE/de-DE.com_sportsmanager.ini
index 9120370..c172113 100644
--- a/src/structure/language/de-DE/de-DE.com_sportsmanager.ini
+++ b/src/structure/language/de-DE/de-DE.com_sportsmanager.ini
@@ -1078,4 +1078,5 @@ COM_SPORTSMANAGER_REALLY_REMOVE_ASSOCIATION_BODY="Willst Du dieses Verbandsorgan
 COM_SPORTSMANAGER_INVALID_ASSOCIATION_BODY_NAME="Ung&uuml;ltiger Name f&uuml;r Verbandsorgan!"
 COM_SPORTSMANAGER_NAME_NOT_COMPLETE="Der Name ist nicht komplett ausgef&uuml;llt"
 COM_SPORTSMANAGER_ADDITIONAL_INFO="Zusatzinfo"
-COM_SPORTSMANAGER_USE_HTML="Hier sollte HTML-formatierter Text verwendet werden"
\ No newline at end of file
+COM_SPORTSMANAGER_USE_HTML="Hier sollte HTML-formatierter Text verwendet werden"
+COM_SPORTSMANAGER_REALLY_REMOVE_ASSOCIATION_BODY_MEMBER="M&ouml;chtest du dieses Mitglied des Verbandsorgans wirklich entfernen?"
\ No newline at end of file
diff --git a/src/structure/language/en-GB/en-GB.com_sportsmanager.ini b/src/structure/language/en-GB/en-GB.com_sportsmanager.ini
index 45ef064..95c6f4e 100644
--- a/src/structure/language/en-GB/en-GB.com_sportsmanager.ini
+++ b/src/structure/language/en-GB/en-GB.com_sportsmanager.ini
@@ -1078,4 +1078,5 @@ COM_SPORTSMANAGER_REALLY_REMOVE_ASSOCIATION_BODY="Do you really want to remove t
 COM_SPORTSMANAGER_INVALID_ASSOCIATION_BODY_NAME="Invalid association body name"
 COM_SPORTSMANAGER_NAME_NOT_COMPLETE="The name is not completely filled in"
 COM_SPORTSMANAGER_ADDITIONAL_INFO="Additional information"
-COM_SPORTSMANAGER_USE_HTML="HTML-formatted text should be used here."
\ No newline at end of file
+COM_SPORTSMANAGER_USE_HTML="HTML-formatted text should be used here."
+COM_SPORTSMANAGER_REALLY_REMOVE_ASSOCIATION_BODY_MEMBER="Do you really want to remove this association body member?"
\ No newline at end of file
diff --git a/src/structure/script.php b/src/structure/script.php
index 25029b9..ed45b26 100644
--- a/src/structure/script.php
+++ b/src/structure/script.php
@@ -1184,7 +1184,7 @@ return new class () implements InstallerScriptInterface
         $db->setQuery( $query );
         if (!$db->execute()) { die($db->stderr(true)); }
 
-		$query = "CREATE TABLE `stfv_sportsmanager_verbandsorgane` ("
+		$query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_verbandsorgane` ("
 			. "\n `verbandsorgane_id` int(11) NOT NULL AUTO_INCREMENT,"
 			. "\n `veranstalter_id` int(11) DEFAULT NULL,"
 			. "\n `verbandsorgan` varchar(32) DEFAULT NULL,"
@@ -1198,7 +1198,7 @@ return new class () implements InstallerScriptInterface
         $db->setQuery( $query );
         if (!$db->execute()) { die($db->stderr(true)); }
 		
-		$query = "CREATE TABLE `stfv_sportsmanager_mitglied_von_verbandsorgan` ("
+		$query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_mitglied_von_verbandsorgan` ("
 			. "\n `mitglied_von_verbandsorgan_id` int(11) NOT NULL AUTO_INCREMENT,"
 			. "\n `verbandsorgane_id` int(11) DEFAULT NULL,"
 			. "\n `funktion` varchar(32) DEFAULT NULL,"
@@ -1781,5 +1781,13 @@ return new class () implements InstallerScriptInterface
 		$query = "DROP TABLE IF EXISTS `#__sportsmanager_email_vorlagen`;";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
+		
+		$query = "DROP TABLE IF EXISTS `#__sportsmanager_verbandsorgane`;";
+		$db->setQuery( $query );
+		if (!$db->execute()) { die($db->stderr(true)); }
+		
+		$query = "DROP TABLE IF EXISTS `#__sportsmanager_mitglied_von_verbandsorgan`;";
+		$db->setQuery( $query );
+		if (!$db->execute()) { die($db->stderr(true)); }
 	}
 };