1 files changed, 5 insertions, 14 deletions
diff --git a/model/saml.go b/model/saml.go
index f5826a95d..e74750156 100644
--- a/model/saml.go
+++ b/model/saml.go
@@ -29,21 +29,12 @@ type SamlCertificateStatus struct {
 }
 
 func (s *SamlCertificateStatus) ToJson() string {
-	b, err := json.Marshal(s)
-	if err != nil {
-		return ""
-	} else {
-		return string(b)
-	}
+	b, _ := json.Marshal(s)
+	return string(b)
 }
 
 func SamlCertificateStatusFromJson(data io.Reader) *SamlCertificateStatus {
-	decoder := json.NewDecoder(data)
-	var status SamlCertificateStatus
-	err := decoder.Decode(&status)
-	if err == nil {
-		return &status
-	} else {
-		return nil
-	}
+	var status *SamlCertificateStatus
+	json.NewDecoder(data).Decode(&status)
+	return status
 }