From 40b2f00dc5b1dfee5800b292c3bd894747e365c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 11 Mar 2016 23:39:42 +0100
Subject: [PATCH] fix(): fixed from db -> json

---
 pkg/components/simplejson/simplejson.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/components/simplejson/simplejson.go b/pkg/components/simplejson/simplejson.go
index 1ea8aa346aa..2a96d06d694 100644
--- a/pkg/components/simplejson/simplejson.go
+++ b/pkg/components/simplejson/simplejson.go
@@ -26,6 +26,10 @@ func (j *Json) FromDB(data []byte) error {
 }
 
 func (j *Json) ToDB() ([]byte, error) {
+	if j == nil || j.data == nil {
+		return nil, nil
+	}
+
 	return j.Encode()
 }