fixes after testing

2 files changed, 10 insertions, 3 deletions

diff --git a/lib/Controller/PreferencesController.php b/lib/Controller/PreferencesController.php
index 26d6832f..6474b0e0 100644
--- a/lib/Controller/PreferencesController.php
+++ b/lib/Controller/PreferencesController.php
@@ -96,5 +96,4 @@ class PreferencesController extends Controller {
 
 		return new DataResponse($preferences, Http::STATUS_OK);
 	}
-
 }
diff --git a/lib/Controller/SystemController.php b/lib/Controller/SystemController.php
index ea3a0be1..defe24cf 100644
--- a/lib/Controller/SystemController.php
+++ b/lib/Controller/SystemController.php
@@ -129,7 +129,11 @@ class SystemController extends Controller {
 	 * @return DataResponse
 	 */
 	public function validatePublicUsername($pollId, $userName, $token) {
-		return new DataResponse(['result' => $this->systemService->validatePublicUsername($pollId, $userName, $token), 'name' => $userName], Http::STATUS_OK);
+		try {
+			return new DataResponse(['result' => $this->systemService->validatePublicUsername($pollId, $userName, $token), 'name' => $userName], Http::STATUS_OK);
+		} catch (\Exception $e) {
+			return new DataResponse(['error' => $e->getMessage()], $e->getStatus());
+		}
 	}
 
 	/**
@@ -139,6 +143,10 @@ class SystemController extends Controller {
 	 * @return DataResponse
 	 */
 	public function validateEmailAddress($emailAddress) {
-		return new DataResponse(['result' => $this->systemService->validateEmailAddress($emailAddress), 'emailAddress' => $emailAddress], Http::STATUS_OK);
+		try {
+			return new DataResponse(['result' => $this->systemService->validateEmailAddress($emailAddress), 'emailAddress' => $emailAddress], Http::STATUS_OK);
+		} catch (\Exception $e) {
+			return new DataResponse(['error' => $e->getMessage()], $e->getStatus());
+		}
 	}
 }