diff --git a/Classes/Controller/JoblistController.php b/Classes/Controller/JoblistController.php
index a399a50f6821680b50f84f2ec369e48a81100733..4d0bb4bafc53ddda258187231630708e5439de7d 100644
--- a/Classes/Controller/JoblistController.php
+++ b/Classes/Controller/JoblistController.php
@@ -29,13 +29,13 @@ namespace SGalinski\SgJobs\Controller;
 use SGalinski\SgJobs\Domain\Model\JobApplication;
 use SGalinski\SgMail\Service\MailTemplateService;
 use TYPO3\CMS\Core\Log\LogLevel;
+use TYPO3\CMS\Core\Log\LogManager;
 use TYPO3\CMS\Core\Resource\DuplicationBehavior;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Utility\File\ExtendedFileUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
-use TYPO3\CMS\Extbase\Object\ObjectManager;
 
 /**
  * The joblist plugin controller
@@ -93,6 +93,7 @@ class JoblistController extends ActionController {
 	 *
 	 * @param JobApplication $applyData
 	 * @param string $error
+	 * @throws \InvalidArgumentException
 	 */
 	public function applyFormAction(JobApplication $applyData = NULL, $error = NULL) {
 		if ($this->request->getOriginalRequest()) {
@@ -100,8 +101,8 @@ class JoblistController extends ActionController {
 			$this->view->assign('uploadedFiles', $uploadedFiles);
 		}
 
-		if ($error !== NULL) {
-			$logger = GeneralUtility::makeInstance('TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
+		if ($error !== NULL && $error !== '') {
+			$logger = $this->objectManager->get(LogManager::class)->getLogger(__CLASS__);
 			$logger->log(LogLevel::ALERT, $error);
 			$this->view->assign('error', 1);
 		}
@@ -248,8 +249,7 @@ class JoblistController extends ActionController {
 	 * @throws \InvalidArgumentException
 	 */
 	private function getExistingFiles($folder): array {
-		$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
-		$resourceFactory = $objectManager->get(ResourceFactory::class);
+		$resourceFactory = $this->objectManager->get(ResourceFactory::class);
 		$storage = $resourceFactory->getStorageObject(1);
 		$folderObject = $storage->getFolder('/Extension/' . $folder);
 
@@ -288,8 +288,7 @@ class JoblistController extends ActionController {
 	 * @throws \InvalidArgumentException
 	 */
 	private function submitApplicationFiles(JobApplication $applicationData, $folderName) {
-		$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
-		$resourceFactory = $objectManager->get(ResourceFactory::class);
+		$resourceFactory = $this->objectManager->get(ResourceFactory::class);
 
 		$storage = $resourceFactory->getStorageObject(1);
 		$newName = date('Ymd-His') . '_' . $applicationData->getFirstName();
@@ -416,8 +415,7 @@ class JoblistController extends ActionController {
 		$data = [];
 		$namespace = key($_FILES);
 
-		$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
-		$resourceFactory = $objectManager->get(ResourceFactory::class);
+		$resourceFactory = $this->objectManager->get(ResourceFactory::class);
 		$storage = $resourceFactory->getStorageObject(1);
 		if (!$storage->hasFolder('/Extension/temp/' . $folderName . '/' . $fieldName)) {
 			$storage->createFolder('/Extension/temp/' . $folderName . '/' . $fieldName);
@@ -428,9 +426,7 @@ class JoblistController extends ActionController {
 		// Register every upload field from the form:
 		$this->registerUploadField($data, $namespace, $fieldName, $targetFalDirectory);
 
-		// Initializing:
-		/** @var \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility $fileProcessor */
-		$fileProcessor = GeneralUtility::makeInstance(ExtendedFileUtility::class);
+		$fileProcessor = $this->objectManager->get(ExtendedFileUtility::class);
 		$fileProcessor->setActionPermissions(['addFile' => TRUE]);
 		$fileProcessor->setFileExtensionPermissions($this->settings['allowedFileExtensions'], '');