diff --git a/api/oauth.go b/api/oauth.go
index bb1e3a9..1a4d204 100644
--- a/api/oauth.go
+++ b/api/oauth.go
@@ -83,12 +83,14 @@ func (api *API) oauthAuthenticate(request *restful.Request, response *restful.Re
 	}
 	_, tokenString, err := api.createToken(user, claims)
 	if err != nil {
-		panic(err)
+		response.WriteError(http.StatusUnprocessableEntity, fmt.Errorf("Not possible to create valid token: %s", err.Error()))
+		return
 	}
 
 	_, err = api.checkToken(tokenString)
 	if err != nil {
-		panic(err)
+		response.WriteError(http.StatusUnprocessableEntity, fmt.Errorf("Not valid token after creation: %s", err.Error()))
+		return
 	}
 
 	response.WriteEntity(&AuthResponse{tokenString, claims})