diff --git a/system/service/application.go b/system/service/application.go
index 02fee1513..76e246e33 100644
--- a/system/service/application.go
+++ b/system/service/application.go
@@ -70,7 +70,7 @@ func (svc *application) With(ctx context.Context) ApplicationService {
 
 func (svc *application) FindByID(ID uint64) (app *types.Application, err error) {
 	if ID == 0 {
-		return nil, ErrInvalidID
+		return nil, ErrInvalidID.withStack()
 	}
 
 	if app, err = svc.application.FindByID(ID); err != nil {
diff --git a/system/service/role.go b/system/service/role.go
index 3d0d1eb08..fd63a2872 100644
--- a/system/service/role.go
+++ b/system/service/role.go
@@ -109,7 +109,7 @@ func (svc role) FindByID(roleID uint64) (*types.Role, error) {
 
 func (svc role) findByID(roleID uint64) (*types.Role, error) {
 	if roleID == 0 {
-		return nil, ErrInvalidID
+		return nil, ErrInvalidID.withStack()
 	}
 
 	role, err := svc.role.FindByID(roleID)
@@ -162,7 +162,7 @@ func (svc role) FindByAny(identifier interface{}) (r *types.Role, err error) {
 			}
 		}
 	} else {
-		err = ErrInvalidID
+		err = ErrInvalidID.withStack()
 	}
 
 	if err != nil {
@@ -202,11 +202,11 @@ func (svc role) Create(new *types.Role) (r *types.Role, err error) {
 
 func (svc role) Update(upd *types.Role) (r *types.Role, err error) {
 	if upd.ID == 0 {
-		return nil, ErrInvalidID
+		return nil, ErrInvalidID.withStack()
 	}
 
 	if !handle.IsValid(upd.Handle) {
-		return nil, ErrInvalidHandle
+		return nil, ErrInvalidHandle.withStack()
 	}
 
 	if !svc.ac.CanUpdateRole(svc.ctx, upd) {
@@ -327,7 +327,7 @@ func (svc role) Merge(roleID, targetRoleID uint64) error {
 	}
 
 	if targetRoleID == 0 {
-		return ErrInvalidID
+		return ErrInvalidID.withStack()
 	}
 
 	if !svc.ac.CanUpdateRole(svc.ctx, role) {
@@ -344,7 +344,7 @@ func (svc role) Move(roleID, targetOrganisationID uint64) error {
 	}
 
 	if targetOrganisationID == 0 {
-		return ErrInvalidID
+		return ErrInvalidID.withStack()
 	}
 
 	if !svc.ac.CanUpdateRole(svc.ctx, role) {
diff --git a/system/service/user.go b/system/service/user.go
index 4e8b4eac7..089bbe9d6 100644
--- a/system/service/user.go
+++ b/system/service/user.go
@@ -154,7 +154,7 @@ func (svc user) With(ctx context.Context) UserService {
 
 func (svc user) FindByID(ID uint64) (*types.User, error) {
 	if ID == 0 {
-		return nil, ErrInvalidID
+		return nil, ErrInvalidID.withStack()
 	}
 
 	return svc.proc(svc.user.FindByID(ID))
@@ -189,7 +189,7 @@ func (svc user) FindByAny(identifier interface{}) (u *types.User, err error) {
 			u, err = svc.FindByHandle(strIdentifier)
 		}
 	} else {
-		err = ErrInvalidID
+		err = ErrInvalidID.withStack()
 	}
 
 	if err != nil {
@@ -297,7 +297,7 @@ func (svc user) CreateWithAvatar(input *types.User, avatar io.Reader) (out *type
 
 func (svc user) Update(upd *types.User) (u *types.User, err error) {
 	if upd.ID == 0 {
-		return nil, ErrInvalidID
+		return nil, ErrInvalidID.withStack()
 	}
 
 	if u, err = svc.user.FindByID(upd.ID); err != nil {
@@ -368,7 +368,7 @@ func (svc user) Delete(ID uint64) (err error) {
 	)
 
 	if ID == 0 {
-		return ErrInvalidID
+		return ErrInvalidID.withStack()
 	}
 
 	if del, err = svc.user.FindByID(ID); err != nil {
@@ -393,7 +393,7 @@ func (svc user) Delete(ID uint64) (err error) {
 
 func (svc user) Undelete(ID uint64) (err error) {
 	if ID == 0 {
-		return ErrInvalidID
+		return ErrInvalidID.withStack()
 	}
 
 	var u *types.User
@@ -412,7 +412,7 @@ func (svc user) Undelete(ID uint64) (err error) {
 
 func (svc user) Suspend(ID uint64) (err error) {
 	if ID == 0 {
-		return ErrInvalidID
+		return ErrInvalidID.withStack()
 	}
 
 	var u *types.User
@@ -431,7 +431,7 @@ func (svc user) Suspend(ID uint64) (err error) {
 
 func (svc user) Unsuspend(ID uint64) (err error) {
 	if ID == 0 {
-		return ErrInvalidID
+		return ErrInvalidID.withStack()
 	}
 
 	var u *types.User