Merge branch 'ponzu-dev' of https://github.com/ponzu-cms/ponzu into ponzu-dev

2 files changed, 11 insertions, 2 deletions

diff --git a/system/db/content.go b/system/db/content.go
index e73d803..b96852e 100644
--- a/system/db/content.go
+++ b/system/db/content.go
@@ -203,7 +203,11 @@ func insert(ns string, data url.Values) (int, error) {
 		data.Set("id", cid)
 
 		// add UUID to data for use in embedded Item
-		uid := uuid.NewV4()
+		uid, err := uuid.NewV4()
+		if err != nil {
+			return err
+		}
+
 		data.Set("uuid", uid.String())
 
 		// if type has a specifier, add it to data for downstream processing
diff --git a/system/db/upload.go b/system/db/upload.go
index beeee2d..b7171dd 100644
--- a/system/db/upload.go
+++ b/system/db/upload.go
@@ -28,8 +28,13 @@ func SetUpload(target string, data url.Values) (int, error) {
 
 	if data.Get("uuid") == "" ||
 		data.Get("uuid") == (uuid.UUID{}).String() {
+
 		// set new UUID for upload
-		data.Set("uuid", uuid.NewV4().String())
+		uid, err := uuid.NewV4()
+		if err != nil {
+			return 0, err
+		}
+		data.Set("uuid", uid.String())
 	}
 
 	if data.Get("slug") == "" {