1 files changed, 3 insertions, 3 deletions
diff --git a/model/incoming_webhook.go b/model/incoming_webhook.go
index ce755f889..e8ed6dc82 100644
--- a/model/incoming_webhook.go
+++ b/model/incoming_webhook.go
@@ -193,7 +193,7 @@ func decodeIncomingWebhookRequest(by []byte) (*IncomingWebhookRequest, error) {
 	}
 }
 
-func IncomingWebhookRequestFromJson(data io.Reader) *IncomingWebhookRequest {
+func IncomingWebhookRequestFromJson(data io.Reader) (*IncomingWebhookRequest, *AppError) {
 	buf := new(bytes.Buffer)
 	buf.ReadFrom(data)
 	by := buf.Bytes()
@@ -204,12 +204,12 @@ func IncomingWebhookRequestFromJson(data io.Reader) *IncomingWebhookRequest {
 	if err != nil {
 		o, err = decodeIncomingWebhookRequest(escapeControlCharsFromPayload(by))
 		if err != nil {
-			return nil
+			return nil, NewAppError("IncomingWebhookRequestFromJson", "Unable to parse incoming data", nil, err.Error(), http.StatusBadRequest)
 		}
 	}
 
 	o.Text = ExpandAnnouncement(o.Text)
 	o.Attachments = ProcessSlackAttachments(o.Attachments)
 
-	return o
+	return o, nil
 }