Merge pull request #2097 from mattermost/plt-1781

PLT-1781 Fixing slack import.

1 files changed, 4 insertions, 1 deletions

diff --git a/api/slackimport.go b/api/slackimport.go
index 6497ac261..5ca209c5c 100644
--- a/api/slackimport.go
+++ b/api/slackimport.go
@@ -75,7 +75,10 @@ func SlackParseUsers(data io.Reader) []SlackUser {
 
 	var users []SlackUser
 	if err := decoder.Decode(&users); err != nil {
-		return make([]SlackUser, 0)
+		// This actually returns errors that are ignored.
+		// In this case it is erroring because of a null that Slack
+		// introduced. So we just return the users here.
+		return users
 	}
 	return users
 }