diff --git a/repository/account/account.go b/repository/account/account.go
index 3db1055..6527155 100644
--- a/repository/account/account.go
+++ b/repository/account/account.go
@@ -127,18 +127,23 @@ func (r *AccountRepository) CreateAccount(ctx context.Context, data *model.Accou
 }
 
 func (r *AccountRepository) DeleteAccount(ctx context.Context, accountID string) error {
+	uuidAccount, err := uuid.Parse(accountID)
+	if err != nil {
+		return err
+	}
+
 	tx, err := r.pool.BeginTx(ctx, nil)
 	if err != nil {
 		return err
 	}
 
-	err = r.queries.DeleteAccountById(ctx, uuid.MustParse(accountID))
+	err = r.queries.DeleteAccountById(ctx, uuidAccount)
 	if err != nil {
 		tx.Rollback()
 		return err
 	}
 
-	err = r.queries.DeletePrivilegeByAccID(ctx, uuid.MustParse(accountID))
+	err = r.queries.DeletePrivilegeByAccID(ctx, uuidAccount)
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -175,10 +180,15 @@ func (r *AccountRepository) GetAccounts(ctx context.Context, limit uint64, offse
 
 // test +
 func (r *AccountRepository) UpdatePrivilege(ctx context.Context, privilege *model.ShortPrivilege, accountID string) error {
-	err := r.queries.UpdatePrivilege(ctx, sqlcgen.UpdatePrivilegeParams{
+	uuidAccount, err := uuid.Parse(accountID)
+	if err != nil {
+		return err
+	}
+
+	err = r.queries.UpdatePrivilege(ctx, sqlcgen.UpdatePrivilegeParams{
 		Amount:      int32(privilege.Amount),
 		CreatedAt:   privilege.CreatedAt,
-		AccountID:   uuid.MustParse(accountID),
+		AccountID:   uuidAccount,
 		Privilegeid: privilege.PrivilegeID,
 	})
 
@@ -191,10 +201,15 @@ func (r *AccountRepository) UpdatePrivilege(ctx context.Context, privilege *mode
 
 // test +
 func (r *AccountRepository) InsertPrivilege(ctx context.Context, privilege *model.ShortPrivilege, accountID string) error {
-	err := r.queries.InsertPrivilege(ctx, sqlcgen.InsertPrivilegeParams{
+	uuidAccount, err := uuid.Parse(accountID)
+	if err != nil {
+		return err
+	}
+
+	err = r.queries.InsertPrivilege(ctx, sqlcgen.InsertPrivilegeParams{
 		Amount:        int32(privilege.Amount),
 		CreatedAt:     privilege.CreatedAt,
-		AccountID:     uuid.MustParse(accountID),
+		AccountID:     uuidAccount,
 		Privilegeid:   privilege.PrivilegeID,
 		PrivilegeName: privilege.PrivilegeName,
 	})
diff --git a/repository/quiz/quiz.go b/repository/quiz/quiz.go
index a95daa1..98c2ad9 100644
--- a/repository/quiz/quiz.go
+++ b/repository/quiz/quiz.go
@@ -38,6 +38,11 @@ func (r *QuizRepository) CreateQuiz(ctx context.Context, record *model.Quiz) (ui
 		record.Qid = uuid.NewString()
 	}
 
+	uuidQid, err := uuid.Parse(record.Qid)
+	if err != nil {
+		return 0, err
+	}
+
 	params := sqlcgen.InsertQuizParams{
 		Accountid:         record.AccountId,
 		Fingerprinting:    sql.NullBool{Bool: record.Fingerprinting, Valid: true},
@@ -57,7 +62,7 @@ func (r *QuizRepository) CreateQuiz(ctx context.Context, record *model.Quiz) (ui
 		Pausable:          sql.NullBool{Bool: record.Pausable, Valid: true},
 		ParentIds:         record.ParentIds,
 		QuestionsCount:    sql.NullInt32{Int32: int32(record.QuestionsCount), Valid: true},
-		Qid:               uuid.NullUUID{UUID: uuid.MustParse(record.Qid), Valid: true},
+		Qid:               uuid.NullUUID{UUID: uuidQid, Valid: true},
 	}
 
 	data, err := r.queries.InsertQuiz(ctx, params)
@@ -249,6 +254,11 @@ func (r *QuizRepository) GetQuizList(
 // test +
 // GetQuizByQid method for obtain quiz model by secured id
 func (r *QuizRepository) GetQuizByQid(ctx context.Context, qid string) (model.Quiz, error) {
+	_, err := uuid.Parse(qid)
+	if err != nil {
+		return model.Quiz{}, err
+	}
+
 	fmt.Println("QUID", `
 SELECT * FROM quiz 
 WHERE