diff --git a/pkg/id/id.go b/pkg/id/id.go
index 090fda2ccb034e0301f8a05571662bb89afc8564..5093398e6cfcb39708ab8a64bbd7b64605846dd2 100644
--- a/pkg/id/id.go
+++ b/pkg/id/id.go
@@ -2,36 +2,47 @@ package id
 
 import (
 	"regexp"
+	"strings"
 
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 	"github.com/rs/xid"
 )
 
 const (
-	IDMaxLength   = 64
-	NameMaxLength = 256
+	MaxLengthID   = 64
+	MaxLengthName = 256
 )
 
-var isValidID = regexp.MustCompile(`^[A-Za-z][A-Za-z0-9-_]*$`).MatchString
+var (
+	ErrEmptyID    = errors.New("empty ID")
+	ErrNotValidID = errors.New("id contains invalid characters")
+	ErrLongID     = errors.New("id too long (max 64 symbols)")
+	ErrLongName   = errors.New("name too long (max 256 symbols)")
+	isValidID     = regexp.MustCompile(`^[A-Za-z][A-Za-z0-9-_]*$`).MatchString
+)
 
 func GenerateNewID() string {
 	return xid.New().String()
 }
 
 func ValidateID(id string) error {
-	if len(id) > IDMaxLength {
-		return errors.New("invalid id: too long (max 64 symbols)")
+	trimmedID := strings.TrimSpace(id)
+	if trimmedID == "" {
+		return ErrEmptyID
+	}
+	if len(trimmedID) > MaxLengthID {
+		return ErrLongID
 	}
-	if !isValidID(id) {
-		return errors.New("invalid id: must begin with latin letters and contain latin letters, numbers or '-', '_'")
+	if !isValidID(trimmedID) {
+		return errors.WithDetail(ErrNotValidID, "must begin with latin letters and contain latin letters, numbers or '-', '_'")
 	}
 
 	return nil
 }
 
 func ValidateName(name string) error {
-	if len(name) > NameMaxLength {
-		return errors.New("invalid name: too long (max 256 symbols)")
+	if len(name) > MaxLengthName {
+		return ErrLongName
 	}
 
 	return nil
diff --git a/pkg/id/id_test.go b/pkg/id/id_test.go
index 640b67dae1f36dd383c802effdb0bafded47f461..39a0a690b1b78a294e78adeb8bd5a4da8c39dabb 100644
--- a/pkg/id/id_test.go
+++ b/pkg/id/id_test.go
@@ -28,11 +28,6 @@ func TestValidateID(t *testing.T) {
 			"1test",
 			true,
 		},
-		{
-			"Fail, ID starts with whitespace",
-			" test",
-			true,
-		},
 		{
 			"Fail, ID to long",
 			"9QoulAlFbIcnQYLSudMistN1IczCWrXUTtN5EgNQJd516DN9UjXYJxieJ1RcsNcs1",