diff --git a/sam/repository/channel.go b/sam/repository/channel.go
index 873cab14d..613e923ef 100644
--- a/sam/repository/channel.go
+++ b/sam/repository/channel.go
@@ -57,7 +57,6 @@ func (r channel) Find(ctx context.Context, filter *types.ChannelFilter) ([]*type
 
 	rval := make([]*types.Channel, 0)
 	if err := db.Select(&rval, sql, params...); err != nil {
-		panic(err)
 		return nil, ErrDatabaseError
 	} else {
 		return rval, nil
diff --git a/sam/repository/organisation.go b/sam/repository/organisation.go
index d085be21e..362ed398f 100644
--- a/sam/repository/organisation.go
+++ b/sam/repository/organisation.go
@@ -57,7 +57,6 @@ func (r organisation) Find(ctx context.Context, filter *types.OrganisationFilter
 
 	rval := make([]*types.Organisation, 0)
 	if err := db.Select(&rval, sql, params...); err != nil {
-		panic(err)
 		return nil, ErrDatabaseError
 	} else {
 		return rval, nil
diff --git a/sam/repository/team.go b/sam/repository/team.go
index 0d37786c2..0bf773c94 100644
--- a/sam/repository/team.go
+++ b/sam/repository/team.go
@@ -57,7 +57,6 @@ func (r team) Find(ctx context.Context, filter *types.TeamFilter) ([]*types.Team
 
 	rval := make([]*types.Team, 0)
 	if err := db.Select(&rval, sql, params...); err != nil {
-		panic(err)
 		return nil, ErrDatabaseError
 	} else {
 		return rval, nil
diff --git a/sam/repository/user.go b/sam/repository/user.go
index 4e15f2203..c54e028cc 100644
--- a/sam/repository/user.go
+++ b/sam/repository/user.go
@@ -74,7 +74,6 @@ func (r user) Find(ctx context.Context, filter *types.UserFilter) ([]*types.User
 
 	rval := make([]*types.User, 0)
 	if err := db.Select(&rval, sql, params...); err != nil {
-		panic(err)
 		return nil, ErrDatabaseError
 	} else {
 		return rval, nil