1 files changed, 5 insertions, 14 deletions
diff --git a/model/push_notification.go b/model/push_notification.go
index 69719e74c..0d7ba77ac 100644
--- a/model/push_notification.go
+++ b/model/push_notification.go
@@ -47,12 +47,8 @@ type PushNotification struct {
 }
 
 func (me *PushNotification) ToJson() string {
-	b, err := json.Marshal(me)
-	if err != nil {
-		return ""
-	} else {
-		return string(b)
-	}
+	b, _ := json.Marshal(me)
+	return string(b)
 }
 
 func (me *PushNotification) SetDeviceIdAndPlatform(deviceId string) {
@@ -66,12 +62,7 @@ func (me *PushNotification) SetDeviceIdAndPlatform(deviceId string) {
 }
 
 func PushNotificationFromJson(data io.Reader) *PushNotification {
-	decoder := json.NewDecoder(data)
-	var me PushNotification
-	err := decoder.Decode(&me)
-	if err == nil {
-		return &me
-	} else {
-		return nil
-	}
+	var me *PushNotification
+	json.NewDecoder(data).Decode(&me)
+	return me
 }