2 files changed, 28 insertions, 26 deletions
diff --git a/src/CamilStaps/BotleaguesApi/BotleaguesApiServiceProvider.php b/src/CamilStaps/BotleaguesApi/BotleaguesApiServiceProvider.php
index d962d70..7521ebf 100644
--- a/src/CamilStaps/BotleaguesApi/BotleaguesApiServiceProvider.php
+++ b/src/CamilStaps/BotleaguesApi/BotleaguesApiServiceProvider.php
@@ -52,7 +52,7 @@ class BotleaguesApiServiceProvider extends ServiceProvider {
         }
         header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
         header('Access-Control-Allow-Headers: Authorization');
-		
+
 		$this->setupErrorHandlers();
     }
 
@@ -85,30 +85,32 @@ class BotleaguesApiServiceProvider extends ServiceProvider {
 //				500);
 //		});
 
-//		API::error(function(\Illuminate\Database\Eloquent\ModelNotFoundException $e) {
-//			return Response::make(
-//				['error' => 'Resource not found'],
-//				404);
-//		});
-//		API::error(function(\Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException $e) {
-//			return Response::make(
-//				['error' => !config('app.debug') || empty($e->getMessage()) ? 'Access denied' : $e->getMessage()],
-//				404);
-//		});
-//		API::error(function(Exception\ValidationException $e) {
-//			return Response::make(
-//				[
-//					'error' => $e->getMessage(),
-//					'errors' => $e->errors
-//				],
-//				500);
-//		});
-//
-//		API::error(function(\Exception $e) {
-//			return Response::make(
-//				['error' => Config::get('app.debug') ? $e->getMessage() : "Internal error"],
-//				500);
-//		});
+        $exception = app('api.exception');
+
+		$exception->register(function(\Illuminate\Database\Eloquent\ModelNotFoundException $e) {
+			return Response::make(
+				['error' => 'Resource not found'],
+				404);
+		});
+        $exception->register(function(\Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException $e) {
+			return Response::make(
+				['error' => !config('app.debug') || empty($e->getMessage()) ? 'Access denied' : $e->getMessage()],
+				404);
+		});
+        $exception->register(function(Exception\ValidationException $e) {
+			return Response::make(
+				[
+					'error' => $e->getMessage(),
+					'errors' => $e->errors
+				],
+				500);
+		});
+
+        $exception->register(function(\Exception $e) {
+			return Response::make(
+				['error' => Config::get('app.debug') ? $e->getMessage() : "Internal error"],
+				500);
+		});
 	}
 
 }
diff --git a/src/CamilStaps/BotleaguesApi/Database/PasswordReminder.php b/src/CamilStaps/BotleaguesApi/Database/PasswordReminder.php
index 204df90..65c4773 100644
--- a/src/CamilStaps/BotleaguesApi/Database/PasswordReminder.php
+++ b/src/CamilStaps/BotleaguesApi/Database/PasswordReminder.php
@@ -22,7 +22,7 @@ class PasswordReminder extends Model {
     public function save(array $options = array()) {
         $this->valid_till = date("Y-m-d H:i:s", time() + 3600);
 
-        $user = User::find($this->userId);
+        $user = User::findOrFail($this->userId);
         Mail::send('botleagues-api::emails.auth.reminder', ['token' => $this->token], function($message) use ($user) {
             $message->to($user->email, "User " . $user->id);
         });