diff --git a/src/Util/PhotoInfoHelper.js b/src/Util/PhotoInfoHelper.js
index 54f1f23..de386b0 100644
--- a/src/Util/PhotoInfoHelper.js
+++ b/src/Util/PhotoInfoHelper.js
@@ -95,6 +95,9 @@ function ParsePhotoInfo(tags, description) {
 }
 
 function SerializePhotoInfo(photoInfo) {
+    if (!photoInfo) {
+        return [];
+    }
     let tags = [];
     for (const event of photoInfo.event) {
         tags.push(TAG_EVENT + "$" + event);