diff --git a/pkg/slackbot/users.go b/pkg/slackbot/users.go
index 5ad0485..15d4658 100644
--- a/pkg/slackbot/users.go
+++ b/pkg/slackbot/users.go
@@ -1,8 +1,6 @@
 package slackbot
 
 import (
-	"fmt"
-
 	"github.com/slack-go/slack"
 	"github.com/thoas/go-funk"
 	"go.uber.org/zap"
@@ -18,7 +16,8 @@ func (c *Client) GetUsersInfo(users ...string) (*[]slack.User, error) {
 		usersInfoResponse, err := c.socketModeClient.GetUsersInfo(splittedUsersList[usersList]...)
 		if err != nil {
 			c.logger.Error("get users info failed", zap.Any("users", splittedUsersList[usersList]), zap.Error(err))
-			return nil, fmt.Errorf("get users info failed. err: %v", err)
+			emptyArray := make([]slack.User, len(splittedUsersList))
+			return &emptyArray, nil
 		}
 		usersInfo = append(usersInfo, *usersInfoResponse...)
 	}
diff --git a/service/incident_service.go b/service/incident_service.go
index 1234b68..2125fd1 100644
--- a/service/incident_service.go
+++ b/service/incident_service.go
@@ -182,8 +182,17 @@ func (i *incidentService) GetIncidentResponseFromIncidentEntity(
 				incidentResponses[incidentIndex].StatusName = is.Name
 			}
 		}
-		incidentResponses[incidentIndex].CreatedBy = userEmailMappings[incidents[incidentIndex].CreatedBy]
-		incidentResponses[incidentIndex].UpdatedBy = userEmailMappings[incidents[incidentIndex].UpdatedBy]
+		if userEmailMappings[incidents[incidentIndex].CreatedBy] != "" {
+			incidentResponses[incidentIndex].CreatedBy = userEmailMappings[incidents[incidentIndex].CreatedBy]
+		} else {
+			incidentResponses[incidentIndex].CreatedBy = incidents[incidentIndex].CreatedBy
+		}
+
+		if userEmailMappings[incidents[incidentIndex].UpdatedBy] != "" {
+			incidentResponses[incidentIndex].UpdatedBy = userEmailMappings[incidents[incidentIndex].UpdatedBy]
+		} else {
+			incidentResponses[incidentIndex].UpdatedBy = incidents[incidentIndex].UpdatedBy
+		}
 	}
 	return incidentResponses, nil
 }