diff --git a/application/controllers/lehre/anrechnung/ReviewAnrechnungDetail.php b/application/controllers/lehre/anrechnung/ReviewAnrechnungDetail.php
index 78175f4e6..7981f0ac8 100644
--- a/application/controllers/lehre/anrechnung/ReviewAnrechnungDetail.php
+++ b/application/controllers/lehre/anrechnung/ReviewAnrechnungDetail.php
@@ -79,7 +79,7 @@ class reviewAnrechnungDetail extends Auth_Controller
 
 		// Get Anrechung data
 		$anrechnungData = $this->anrechnunglib->getAnrechnungData($anrechnung_id);
-		
+
 		// Get Antrag data
 		$antragData = $this->anrechnunglib->getAntragData(
 			$anrechnungData->prestudent_id,
@@ -110,7 +110,7 @@ class reviewAnrechnungDetail extends Auth_Controller
 		{
 			return $this->outputJsonError('Fehler beim Übertragen der Daten.');
 		}
-		
+
 		// Get lectors person data
 		if (!$person = getData($this->PersonModel->getByUID($this->_uid))[0])
 		{
@@ -218,10 +218,10 @@ class reviewAnrechnungDetail extends Auth_Controller
 
 		// Check if user is entitled to read dms doc
 		self::_checkIfEntitledToReadDMSDoc($dms_id);
-		
+
 		// Set filename to be used on downlaod
 		$filename = $this->anrechnunglib->setFilenameOnDownload($dms_id);
-		
+
 		// Download file
 		$this->dmslib->download($dms_id, $filename);
 	}
@@ -320,7 +320,12 @@ class reviewAnrechnungDetail extends Auth_Controller
 		foreach ($studiengang_kz_arr as $studiengang_kz)
 		{
 			// Get STGL mail address, if available, otherwise get assistance mail address
-			list ($to, $vorname) = $this->_getSTGLMailAddress($studiengang_kz);
+			$stgmail = $this->_getSTGLMailAddress($studiengang_kz);
+
+			if(isSuccess($stgmail) && hasData($stgmail))
+				list ($to, $vorname) = getData($stgmail)[0];
+			else
+				show_error ('Failed retrieving DegreeProgram Mail');
 
 			// Get full name of lector
 			$this->load->model('person/Person_model', 'PersonModel');
@@ -361,24 +366,28 @@ class reviewAnrechnungDetail extends Auth_Controller
 		$result = $this->StudiengangModel->getLeitung($stg_kz);
 
 		// Get STGL mail address, if available
-		if (hasData($result))
+		if (isSuccess($result) && hasData($result))
 		{
-			return array(
+			return success(array(
 				$result->retval[0]->uid. '@'. DOMAIN,
 				$result->retval[0]->vorname
-			);
+			));
 		}
 		// ...otherwise get assistance mail address
 		else
 		{
 			$result = $this->StudiengangModel->load($stg_kz);
 
-			if (hasData($result))
+			if (isSuccess($result) && hasData($result))
 			{
-				return array(
+				return success(array(
 					$result->retval[0]->email,
 					''
-				);
+				));
+			}
+			else
+			{
+				return error('Keine E-Mail für diesen Stg gefunden');
 			}
 		}
 	}
diff --git a/application/controllers/lehre/anrechnung/ReviewAnrechnungUebersicht.php b/application/controllers/lehre/anrechnung/ReviewAnrechnungUebersicht.php
index cd0b7afaf..e5475d0d0 100644
--- a/application/controllers/lehre/anrechnung/ReviewAnrechnungUebersicht.php
+++ b/application/controllers/lehre/anrechnung/ReviewAnrechnungUebersicht.php
@@ -5,15 +5,15 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 class reviewAnrechnungUebersicht extends Auth_Controller
 {
 	const BERECHTIGUNG_ANRECHNUNG_EMPFEHLEN = 'lehre/anrechnung_empfehlen';
-	
+
 	const APPROVE_ANRECHNUNG_URI = '/lehre/anrechnung/ApproveAnrechnungUebersicht';
-	
+
 	const ANRECHNUNGSTATUS_PROGRESSED_BY_STGL = 'inProgressDP';
 	const ANRECHNUNGSTATUS_PROGRESSED_BY_KF = 'inProgressKF';
 	const ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR = 'inProgressLektor';
 	const ANRECHNUNGSTATUS_APPROVED = 'approved';
 	const ANRECHNUNGSTATUS_REJECTED = 'rejected';
-	
+
 	public function __construct()
 	{
 		// Set required permissions
@@ -25,24 +25,24 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 				'dontRecommend'   => 'lehre/anrechnung_empfehlen:rw'
 			)
 		);
-		
+
 		// Load models
 		$this->load->model('education/Anrechnung_model', 'AnrechnungModel');
 		$this->load->model('education/Anrechnungstatus_model', 'AnrechnungstatusModel');
 		$this->load->model('content/DmsVersion_model', 'DmsVersionModel');
 		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-		
+
 		// Load libraries
 		$this->load->library('WidgetLib');
 		$this->load->library('PermissionLib');
 		$this->load->library('AnrechnungLib');
 		$this->load->library('DmsLib');
-		
+
 		// Load helpers
 		$this->load->helper('form');
 		$this->load->helper('url');
 		$this->load->helper('hlp_sancho_helper');
-		
+
 		// Load language phrases
 		$this->loadPhrases(
 			array(
@@ -54,12 +54,12 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 				'table'
 			)
 		);
-		
+
 		$this->_setAuthUID();
-		
+
 		$this->setControllerId();
 	}
-	
+
 	public function index()
 	{
 		// Get study semester
@@ -70,14 +70,14 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 			$result = $this->StudiensemesterModel->getNearest();
 			$studiensemester_kurzbz = getData($result)[0]->studiensemester_kurzbz;
 		}
-		
+
 		$viewData = array(
 			'studiensemester_selected' => $studiensemester_kurzbz
 		);
-		
+
 		$this->load->view('lehre/anrechnung/reviewAnrechnungUebersicht.php', $viewData);
 	}
-	
+
 	/**
 	 * Recommend Anrechnungen.
 	 */
@@ -103,7 +103,7 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 				);
 			}
 		}
-		
+
 		// Output json to ajax
 		if (isset($json) && !isEmptyArray($json))
 		{
@@ -123,19 +123,19 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 			return $this->outputJsonError($this->p->t('ui', 'errorNichtAusgefuehrt'));
 		}
 	}
-	
+
 	/**
 	 * Dont recommend Anrechnungen.
 	 */
 	public function dontRecommend()
 	{
 		$data = $this->input->post('data');
-		
+
 		if(isEmptyArray($data))
 		{
 			return $this->outputJsonError('Fehler beim Übertragen der Daten.');
 		}
-		
+
 		foreach ($data as $item)
 		{
 			// Approve Anrechnung
@@ -149,7 +149,7 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 				);
 			}
 		}
-		
+
 		// Output json to ajax
 		if (isset($json) && !isEmptyArray($json))
 		{
@@ -158,7 +158,7 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 			{
 				show_error('Failed sending emails');
 			}
-			
+
 			return $this->outputJsonSuccess($json);
 		}
 		else
@@ -166,7 +166,7 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 			return $this->outputJsonError($this->p->t('ui', 'errorNichtAusgefuehrt'));
 		}
 	}
-	
+
 	/**
 	 * Download and open uploaded document (Nachweisdokument).
 	 */
@@ -178,28 +178,28 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 		{
 			show_error('Wrong parameter');
 		}
-		
+
 		// Check if user is entitled to read dms doc
 		self::_checkIfEntitledToReadDMSDoc($dms_id);
-		
+
 		// Set filename to be used on downlaod
 		$filename = $this->anrechnunglib->setFilenameOnDownload($dms_id);
-		
+
 		// Download file
 		$this->dmslib->download($dms_id, $filename);
 	}
-	
-	
+
+
 	/**
 	 * Retrieve the UID of the logged user and checks if it is valid
 	 */
 	private function _setAuthUID()
 	{
 		$this->_uid = getAuthUID();
-		
+
 		if (!$this->_uid) show_error('User authentification failed');
 	}
-	
+
 	/**
 	 * Check if user is entitled to read dms doc
 	 * @param $dms_id
@@ -207,15 +207,15 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 	private function _checkIfEntitledToReadDMSDoc($dms_id)
 	{
 		$result = $this->AnrechnungModel->loadWhere(array('dms_id' => $dms_id));
-		
+
 		if(!$result = getData($result)[0])
 		{
 			show_error('Failed retrieving Anrechnung');
 		}
-		
+
 		$result = $this->LehrveranstaltungModel
 			->getLecturersByLv($result->studiensemester_kurzbz, $result->lehrveranstaltung_id);
-		
+
 		if($result = getData($result))
 		{
 			$entitled_lector_arr = array_column($result, 'uid');
@@ -225,10 +225,10 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 				return;
 			}
 		}
-		
+
 		show_error('You are not entitled to read this document');
 	}
-	
+
 	/**
 	 * Send mails to STGL (if not present then to STGL assistance)
 	 * @param $mail_params
@@ -239,36 +239,41 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 	{
 		// Get studiengaenge
 		$studiengang_kz_arr = array();
-		
+
 		foreach ($mail_params as $item)
 		{
 			$this->AnrechnungModel->addSelect('studiengang_kz');
 			$this->AnrechnungModel->addJoin('public.tbl_prestudent', 'prestudent_id');
-			
+
 			$studiengang_kz_arr[]= $this->AnrechnungModel->load($item['anrechnung_id'])->retval[0]->studiengang_kz;
 		}
-		
+
 		$studiengang_kz_arr = array_unique($studiengang_kz_arr);
-		
+
 		// Send mail to STGL of each studiengang
 		foreach ($studiengang_kz_arr as $studiengang_kz)
 		{
 			// Get STGL mail address, if available, otherwise get assistance mail address
-			list ($to, $vorname) = $this->_getSTGLMailAddress($studiengang_kz);
-			
+			$stgmail = $this->_getSTGLMailAddress($studiengang_kz);
+
+			if(isSuccess($stgmail) && hasData($stgmail))
+				list ($to, $vorname) = getData($stgmail)[0];
+			else
+				show_error ('Failed retrieving DegreeProgram Mail');
+
 			// Get full name of lector
 			$this->load->model('person/Person_model', 'PersonModel');
 			if (!$lector_name = getData($this->PersonModel->getFullName($this->_uid)))
 			{
 				show_error ('Failed retrieving person');
 			}
-			
+
 			// Link to Antrag genehmigen
 			$url =
 				CIS_ROOT. 'cis/index.php?menu='.
 				CIS_ROOT. 'cis/menu.php?content_id=&content='.
 				CIS_ROOT. index_page(). self::APPROVE_ANRECHNUNG_URI;
-			
+
 			// Prepare mail content
 			$body_fields = array(
 				'vorname'                       => $vorname,
@@ -276,7 +281,7 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 				'empfehlung'                    => $empfehlung ? 'positive' : 'negative',
 				'link'		                    => anchor($url, 'Anrechnungsanträge Übersicht')
 			);
-			
+
 			sendSanchoMail(
 				'AnrechnungEmpfehlungAbgeben',
 				$body_fields,
@@ -284,37 +289,41 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 				'Anerkennung nachgewiesener Kenntnisse: Empfehlung wurde abgegeben'
 			);
 		}
-		
+
 		return true;
 	}
-	
+
 	// Get STGL mail address, if available, otherwise get assistance mail address
 	private function _getSTGLMailAddress($stg_kz)
 	{
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		$result = $this->StudiengangModel->getLeitung($stg_kz);
-		
+
 		// Get STGL mail address, if available
-		if (hasData($result))
+		if (isSuccess($result) && hasData($result))
 		{
-			return array(
+			return success(array(
 				$result->retval[0]->uid. '@'. DOMAIN,
 				$result->retval[0]->vorname
-			);
+			));
 		}
 		// ...otherwise get assistance mail address
 		else
 		{
 			$result = $this->StudiengangModel->load($stg_kz);
-			
-			if (hasData($result))
+
+			if (isSuccess($result) && hasData($result))
 			{
-				return array(
+				return success(array(
 					$result->retval[0]->email,
 					''
-				);
+				));
+			}
+			else
+			{
+				return error('Keine E-Mail für diesen Stg gefunden');
 			}
 		}
 	}
-	
-}
\ No newline at end of file
+
+}
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 299b24d86..e2b3bdfb7 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -448,10 +448,10 @@ class Studiengang_model extends DB_Model
 
 		return $this->execQuery($query, array($typ));
 	}
-	
+
 	/**
 	 * Get Studiengangsleitung/en of Studiengang/Studiengaenge.
-     * 
+     *
 	 * @param null $studiengang_kz Numeric or Array
 	 * @return array
 	 */
@@ -461,7 +461,12 @@ class Studiengang_model extends DB_Model
 		$this->addJoin('public.tbl_benutzerfunktion', 'oe_kurzbz');
 		$this->addJoin('public.tbl_benutzer', 'uid');
 		$this->addJoin('public.tbl_person', 'person_id');
-		
+
+		if (!is_numeric($studiengang_kz) && !is_array($studiengang_kz))
+		{
+			return error('Studiengangskennzahl ungültig');
+		}
+
 		if (is_null($studiengang_kz))
 		{
 			$condition = '
@@ -474,6 +479,7 @@ class Studiengang_model extends DB_Model
 		{
             if (is_array($studiengang_kz))
             {
+				$studiengang_kz = array_map(array($this,'escape'), $studiengang_kz);
                 $studiengang_kz = implode(', ', $studiengang_kz);
             }
 			$condition =  '
@@ -483,49 +489,10 @@ class Studiengang_model extends DB_Model
                 AND studiengang_kz IN (' . $studiengang_kz. ')';
 			;
 		}
-		
+
 		return $this->loadWhere($condition);
 	}
 
-    /**
-     * Get Assistance/s of Studiengang/Studiengaenge.
-     *
-     * @param null $studiengang_kz String or Array
-     * @return array
-     */
-    public function getAssistance($studiengang_kz = null)
-    {
-        $this->addSelect('uid, studiengang_kz, oe_kurzbz, vorname, nachname, email');
-        $this->addJoin('public.tbl_benutzerfunktion', 'oe_kurzbz');
-        $this->addJoin('public.tbl_benutzer', 'uid');
-        $this->addJoin('public.tbl_person', 'person_id');
-
-        if (is_null($studiengang_kz))
-        {
-            $condition = '
-                funktion_kurzbz = \'Leitung\'
-                AND ( datum_von <= NOW() OR datum_von IS NULL )
-                AND ( datum_bis >= NOW() OR datum_bis IS NULL )
-            ';
-        }
-        elseif (is_numeric($studiengang_kz) || is_array($studiengang_kz))
-        {
-            if (is_array($studiengang_kz))
-            {
-                $studiengang_kz = implode(', ', $studiengang_kz);
-            }
-
-            $condition =  '
-               funktion_kurzbz = \'ass\'
-                AND ( datum_von <= NOW() OR datum_von IS NULL )
-                AND ( datum_bis >= NOW() OR datum_bis IS NULL )
-                AND studiengang_kz IN (' . $studiengang_kz. ')'
-            ;
-        }
-
-        return $this->loadWhere($condition);
-    }
-
 	public function getStudiengaengeWithOrgForm($typ, $semester)
 	{
 		$query = "SELECT DISTINCT (UPPER(sg.typ || sg.kurzbz || ':' || sp.orgform_kurzbz)) AS Studiengang